This is an automated email from the ASF dual-hosted git repository.
apitrou pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/main by this push:
new 9ddd8d5c52 GH-37266: [CI][C++] Use ARROW_CMAKE_ARGS not CMAKE_ARGS
(#37272)
9ddd8d5c52 is described below
commit 9ddd8d5c52796f20cf619b8f43538b9d454fb9c0
Author: Antoine Pitrou <[email protected]>
AuthorDate: Tue Aug 22 15:24:09 2023 +0200
GH-37266: [CI][C++] Use ARROW_CMAKE_ARGS not CMAKE_ARGS (#37272)
* Closes: #32766
* Closes: #37266
Authored-by: Antoine Pitrou <[email protected]>
Signed-off-by: Antoine Pitrou <[email protected]>
---
.github/workflows/cpp.yml | 2 +-
.github/workflows/ruby.yml | 2 +-
ci/appveyor-cpp-build.bat | 4 ++--
ci/scripts/cpp_build.sh | 4 ++--
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/.github/workflows/cpp.yml b/.github/workflows/cpp.yml
index 401f5dcf89..41032fc1b0 100644
--- a/.github/workflows/cpp.yml
+++ b/.github/workflows/cpp.yml
@@ -370,7 +370,7 @@ jobs:
# Don't use preinstalled Boost by empty BOOST_ROOT and
# -DBoost_NO_BOOST_CMAKE=ON
BOOST_ROOT: ""
- CMAKE_ARGS: >-
+ ARROW_CMAKE_ARGS: >-
-DARROW_PACKAGE_PREFIX=/${{ matrix.msystem_lower}}
-DBoost_NO_BOOST_CMAKE=ON
-DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml
index a05f4d5a11..1e74497557 100644
--- a/.github/workflows/ruby.yml
+++ b/.github/workflows/ruby.yml
@@ -226,7 +226,7 @@ jobs:
# Don't use preinstalled Boost by empty BOOST_ROOT and
# -DBoost_NO_BOOST_CMAKE=ON
BOOST_ROOT: ""
- CMAKE_ARGS: >-
+ ARROW_CMAKE_ARGS: >-
-DARROW_PACKAGE_PREFIX=/ucrt${{ matrix.mingw-n-bits }}
-DBoost_NO_BOOST_CMAKE=ON
-DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
diff --git a/ci/appveyor-cpp-build.bat b/ci/appveyor-cpp-build.bat
index caadaab90b..e69c7bf251 100644
--- a/ci/appveyor-cpp-build.bat
+++ b/ci/appveyor-cpp-build.bat
@@ -37,7 +37,7 @@ call activate arrow
@rem The "main" C++ build script for Windows CI
@rem (i.e. for usual configurations)
-set CMAKE_ARGS=-DARROW_DEPENDENCY_SOURCE=CONDA -DARROW_WITH_BZ2=ON
+set ARROW_CMAKE_ARGS=-DARROW_DEPENDENCY_SOURCE=CONDA -DARROW_WITH_BZ2=ON
@rem Enable warnings-as-errors
set ARROW_CXXFLAGS=/WX /MP
@@ -58,7 +58,7 @@ pushd cpp\build
@rem In release mode, disable optimizations (/Od) for faster compiling
@rem and enable runtime assertions.
-cmake -G "%GENERATOR%" %CMAKE_ARGS% ^
+cmake -G "%GENERATOR%" %ARROW_CMAKE_ARGS% ^
-DARROW_ACERO=ON ^
-DARROW_BOOST_USE_SHARED=ON ^
-DARROW_BUILD_EXAMPLES=ON ^
diff --git a/ci/scripts/cpp_build.sh b/ci/scripts/cpp_build.sh
index f71724cf61..5a89fafc60 100755
--- a/ci/scripts/cpp_build.sh
+++ b/ci/scripts/cpp_build.sh
@@ -34,7 +34,7 @@ if [ ! -z "${CONDA_PREFIX}" ]; then
echo -e "===\n=== Conda environment for build\n==="
conda list
- export CMAKE_ARGS="${CMAKE_ARGS} -DCMAKE_AR=${AR} -DCMAKE_RANLIB=${RANLIB}"
+ export ARROW_CMAKE_ARGS="${ARROW_CMAKE_ARGS} -DCMAKE_AR=${AR}
-DCMAKE_RANLIB=${RANLIB}"
export ARROW_GANDIVA_PC_CXX_FLAGS=$(echo | ${CXX} -E -Wp,-v -xc++ - 2>&1 |
grep '^ ' | awk '{print "-isystem;" substr($1, 1)}' | tr '\n' ';')
elif [ -x "$(command -v xcrun)" ]; then
export ARROW_GANDIVA_PC_CXX_FLAGS="-isysroot;$(xcrun --show-sdk-path)"
@@ -183,7 +183,7 @@ cmake \
-Dzstd_SOURCE=${zstd_SOURCE:-} \
-Dxsimd_SOURCE=${xsimd_SOURCE:-} \
-G "${CMAKE_GENERATOR:-Ninja}" \
- ${CMAKE_ARGS} \
+ ${ARROW_CMAKE_ARGS} \
${source_dir}
export CMAKE_BUILD_PARALLEL_LEVEL=${CMAKE_BUILD_PARALLEL_LEVEL:-$[${n_jobs} +
1]}
