You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by we...@apache.org on 2017/07/29 15:35:41 UTC
arrow git commit: ARROW-1294: [C++] Pin cmake=3.8.0 in MSVC toolchain
build
Repository: arrow
Updated Branches:
refs/heads/master b4e9ba1ae -> ea1b67ceb
ARROW-1294: [C++] Pin cmake=3.8.0 in MSVC toolchain build
See https://github.com/conda-forge/cmake-feedstock/issues/38. Not sure the origin of the build failure but we will pin at 3.8.0 for now
Author: Wes McKinney <we...@twosigma.com>
Closes #910 from wesm/ARROW-1294 and squashes the following commits:
69dfecc4 [Wes McKinney] Pin cmake=3.8.0 in MSVC toolchainbuild
Project: http://git-wip-us.apache.org/repos/asf/arrow/repo
Commit: http://git-wip-us.apache.org/repos/asf/arrow/commit/ea1b67ce
Tree: http://git-wip-us.apache.org/repos/asf/arrow/tree/ea1b67ce
Diff: http://git-wip-us.apache.org/repos/asf/arrow/diff/ea1b67ce
Branch: refs/heads/master
Commit: ea1b67ceb494ce7eb4302e6d09c3cd5101aa5da1
Parents: b4e9ba1
Author: Wes McKinney <we...@twosigma.com>
Authored: Sat Jul 29 11:35:36 2017 -0400
Committer: Wes McKinney <we...@twosigma.com>
Committed: Sat Jul 29 11:35:36 2017 -0400
----------------------------------------------------------------------
ci/msvc-build.bat | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/arrow/blob/ea1b67ce/ci/msvc-build.bat
----------------------------------------------------------------------
diff --git a/ci/msvc-build.bat b/ci/msvc-build.bat
index 22108ab..2a53776 100644
--- a/ci/msvc-build.bat
+++ b/ci/msvc-build.bat
@@ -51,9 +51,16 @@ conda create -n arrow -q -y python=%PYTHON% ^
six pytest setuptools numpy pandas cython ^
thrift-cpp
+@rem ARROW-1294 CMake 3.9.0 in conda-forge breaks the build
+set ARROW_CMAKE_VERSION=3.8.0
+
if "%JOB%" == "Toolchain" (
+
conda install -n arrow -q -y -c conda-forge ^
- flatbuffers rapidjson cmake git boost-cpp ^
+ flatbuffers rapidjson ^
+ cmake=%ARROW_CMAKE_VERSION% ^
+ git ^
+ boost-cpp ^
snappy zlib brotli gflags lz4-c zstd
)