Unpin CMake version in MSVC toolchain builds now that 3.9.1 is in con…

…da-forge Change-Id: Iae4737e6cc41494a491dbc8debc771c6aa69d498
NonVolatileComputing · Aug 24, 2017 · be3b53a · be3b53a
1 parent 2c3a5f4
commit be3b53a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/ci/msvc-build.bat b/ci/msvc-build.bat
@@ -51,14 +51,11 @@ 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=%ARROW_CMAKE_VERSION% ^
+      cmake ^
       git ^
       boost-cpp ^
       snappy zlib brotli gflags lz4-c zstd

diff --git a/dev/release/verify-release-candidate.bat b/dev/release/verify-release-candidate.bat
@@ -20,14 +20,12 @@
 @rem libray build rem dependencies if you want to build them from source as well
 @rem
 
-@rem ARROW-1294 CMake 3.9.0 in conda-forge breaks the build
-@rem set ARROW_CMAKE_VERSION=3.8.0
 @rem set PYTHON=3.6
 @rem conda create -n arrow-verify-release -f -q -y python=%PYTHON%
 @rem conda install -y ^
 @rem       six pytest setuptools numpy pandas cython ^
 @rem       thrift-cpp flatbuffers rapidjson ^
-@rem       cmake=%ARROW_CMAKE_VERSION% ^
+@rem       cmake ^
 @rem       git ^
 @rem       boost-cpp ^
 @rem       snappy zlib brotli gflags lz4-c zstd || exit /B