Fix for gflags

apache · Feb 8, 2019 · 707bc49 · 707bc49
1 parent 5897045
commit 707bc49
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/ci/appveyor-cpp-build.bat b/ci/appveyor-cpp-build.bat
@@ -106,7 +106,6 @@ if "%ARROW_BUILD_GANDIVA%" == "ON" (
 if "%JOB%" == "Toolchain" (
   @rem Install pre-built "toolchain" packages for faster builds
   set CONDA_PACKAGES=%CONDA_PACKAGES% --file=ci\conda_env_cpp.yml
-  set ARROW_BUILD_TOOLCHAIN=%CONDA_PREFIX%\Library
 )
 
 conda create -n arrow -q -y %CONDA_PACKAGES% -c conda-forge

diff --git a/ci/cpp-msvc-build-main.bat b/ci/cpp-msvc-build-main.bat
@@ -22,7 +22,8 @@ set ARROW_HOME=%CONDA_PREFIX%\Library
 set CMAKE_ARGS=-DARROW_VERBOSE_THIRDPARTY_BUILD=OFF
 
 if "%JOB%" == "Toolchain" (
-    set CMAKE_ARGS=%CMAKE_ARGS% -DARROW_WITH_BZ2=ON
+  set CMAKE_ARGS=%CMAKE_ARGS% -DARROW_WITH_BZ2=ON
+  set ARROW_BUILD_TOOLCHAIN=%CONDA_PREFIX%\Library
 )
 
 @rem Retrieve git submodules, configure env var for Parquet unit tests

diff --git a/cpp/cmake_modules/FindGFlags.cmake b/cpp/cmake_modules/FindGFlags.cmake
@@ -40,7 +40,6 @@ set(GFLAGS_STATIC_LIB_NAME
   ${CMAKE_STATIC_LIBRARY_PREFIX}gflags${GFLAGS_STATIC_LIB_SUFFIX})
 
 message(STATUS "GFLAGS_HOME: ${GFLAGS_HOME}")
-message(STATUS "_gflags_roots: ${_gflags_roots}")
 
 if ( _gflags_roots )
   find_path(GFLAGS_INCLUDE_DIR NAMES gflags/gflags.h