Skip to content
This repository was archived by the owner on Nov 1, 2024. It is now read-only.

Commit 0c54a46

Browse files
wenleixfacebook-github-bot
authored andcommitted
Minor changes to setup scripts (#395)
Summary: * Update folly version to be consistent with Velox: https://github.com/facebookincubator/velox/blob/c4237370e40fce925a5c34bd805008248d42684f/scripts/setup-ubuntu.sh#L25 * Minor config flag change (e.g. disable testing), following https://github.com/facebookincubator/velox/blob/04a85f7cb7fcc2eaa3b30b1749c3d97b3bba8676/scripts/setup-macos.sh#L104 and https://github.com/facebookincubator/velox/blob/04a85f7cb7fcc2eaa3b30b1749c3d97b3bba8676/scripts/setup-macos.sh#L109 Pull Request resolved: #395 Reviewed By: bearzx Differential Revision: D37478950 Pulled By: wenleix fbshipit-source-id: 8b6ffa1377b0b6022e6e8550c08e711cab47dff2
1 parent c1cd400 commit 0c54a46

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

scripts/_setup-macos.sh

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ set -x # Print commands that are executed.
2727
SCRIPTDIR=$(dirname "${BASH_SOURCE[0]}")
2828
source $SCRIPTDIR/../csrc/velox/velox/scripts/setup-helper-functions.sh
2929

30-
FB_OS_VERSION=v2021.05.10.00
30+
FB_OS_VERSION=v2022.03.14.00
3131
NPROC=$(sysctl -n hw.physicalcpu)
3232
COMPILER_FLAGS=$(get_cxx_flags $CPU_TARGET)
3333
DEPENDENCY_DIR=${DEPENDENCY_DIR:-$(pwd)}
@@ -107,7 +107,7 @@ function install_build_prerequisites {
107107
}
108108

109109
function install_fmt {
110-
github_checkout fmtlib/fmt 7.1.3
110+
github_checkout fmtlib/fmt 8.0.0
111111
cmake_install -DFMT_TEST=OFF
112112
}
113113

@@ -130,20 +130,19 @@ function install_folly {
130130

131131
function install_ranges_v3 {
132132
github_checkout ericniebler/range-v3 0.12.0
133-
cmake_install -DRANGES_ENABLE_WERROR=OFF
133+
cmake_install -DRANGES_ENABLE_WERROR=OFF -DRANGE_V3_TESTS=OFF -DRANGE_V3_EXAMPLES=OFF
134134
}
135135

136136
function install_re2 {
137137
github_checkout google/re2 2021-04-01
138-
cmake_install
138+
cmake_install -DRE2_BUILD_TESTING=OFF
139139
}
140140

141141
function install_velox_deps {
142142
if [ "${INSTALL_PREREQUISITES:-Y}" == "Y" ]; then
143143
run_and_time install_build_prerequisites
144144
fi
145145
run_and_time install_ranges_v3
146-
run_and_time install_googletest
147146
run_and_time install_fmt
148147
run_and_time install_double_conversion
149148
run_and_time install_folly

scripts/setup-ubuntu.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ source $SCRIPTDIR/../csrc/velox/velox/scripts/setup-helper-functions.sh
2121

2222
CPU_TARGET="${CPU_TARGET:-avx}"
2323
export COMPILER_FLAGS=$(get_cxx_flags $CPU_TARGET)
24-
FB_OS_VERSION=v2021.05.10.00
24+
FB_OS_VERSION=v2022.03.14.00
2525
NPROC=$(getconf _NPROCESSORS_ONLN)
2626
DEPENDENCY_DIR=${DEPENDENCY_DIR:-$(pwd)}
2727

@@ -88,7 +88,7 @@ function cmake_install {
8888
}
8989

9090
function install_fmt {
91-
github_checkout fmtlib/fmt 7.1.3
91+
github_checkout fmtlib/fmt 8.0.0
9292
cmake_install -DFMT_TEST=OFF
9393
}
9494

0 commit comments

Comments
 (0)