Repository: arrow Updated Branches: refs/heads/master f3bcf76f2 -> bea30d6c2
ARROW-1113: [C++] Upgrade to gflags 2.2.0, use tarball instead of git tag This fixes the weirdness I was seeing with make and ninja where the EP was re-running (but doing nothing) Author: Wes McKinney <wes.mckin...@twosigma.com> Closes #776 from wesm/gflags-ep-make-oddness and squashes the following commits: 82b163b2 [Wes McKinney] Upgrade to gflags 2.2.0, use tarball to avoid odd no-op work on subsequent builds with make or ninja Project: http://git-wip-us.apache.org/repos/asf/arrow/repo Commit: http://git-wip-us.apache.org/repos/asf/arrow/commit/bea30d6c Tree: http://git-wip-us.apache.org/repos/asf/arrow/tree/bea30d6c Diff: http://git-wip-us.apache.org/repos/asf/arrow/diff/bea30d6c Branch: refs/heads/master Commit: bea30d6c24ac07b9c4b29ba1523a13dcd27d578b Parents: f3bcf76 Author: Wes McKinney <wes.mckin...@twosigma.com> Authored: Sat Jun 24 12:21:09 2017 -0400 Committer: Wes McKinney <wes.mckin...@twosigma.com> Committed: Sat Jun 24 12:21:09 2017 -0400 ---------------------------------------------------------------------- cpp/cmake_modules/ThirdpartyToolchain.cmake | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/arrow/blob/bea30d6c/cpp/cmake_modules/ThirdpartyToolchain.cmake ---------------------------------------------------------------------- diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake index f51f6ff..d77aa53 100644 --- a/cpp/cmake_modules/ThirdpartyToolchain.cmake +++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake @@ -20,7 +20,7 @@ # Thirdparty toolchain set(THIRDPARTY_DIR "${CMAKE_SOURCE_DIR}/thirdparty") -set(GFLAGS_VERSION "2.1.2") +set(GFLAGS_VERSION "2.2.0") set(GTEST_VERSION "1.8.0") set(GBENCHMARK_VERSION "1.1.0") set(FLATBUFFERS_VERSION "1.7.1") @@ -223,6 +223,7 @@ if(ARROW_BUILD_TESTS OR ARROW_BUILD_BENCHMARKS) if("${GFLAGS_HOME}" STREQUAL "") set(GFLAGS_CMAKE_CXX_FLAGS ${EP_CXX_FLAGS}) + set(GFLAGS_URL "https://github.com/gflags/gflags/archive/v${GFLAGS_VERSION}.tar.gz";) set(GFLAGS_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/gflags_ep-prefix/src/gflags_ep") set(GFLAGS_HOME "${GFLAGS_PREFIX}") set(GFLAGS_INCLUDE_DIR "${GFLAGS_PREFIX}/include") @@ -244,15 +245,13 @@ if(ARROW_BUILD_TESTS OR ARROW_BUILD_BENCHMARKS) if (CMAKE_VERSION VERSION_GREATER "3.2") # BUILD_BYPRODUCTS is a 3.2+ feature ExternalProject_Add(gflags_ep - GIT_REPOSITORY https://github.com/gflags/gflags.git - GIT_TAG cce68f0c9c5d054017425e6e6fd54f696d36e8ee + URL ${GFLAGS_URL} BUILD_IN_SOURCE 1 BUILD_BYPRODUCTS "${GFLAGS_STATIC_LIB}" CMAKE_ARGS ${GFLAGS_CMAKE_ARGS}) else() ExternalProject_Add(gflags_ep - GIT_REPOSITORY https://github.com/gflags/gflags.git - GIT_TAG cce68f0c9c5d054017425e6e6fd54f696d36e8ee + URL ${GFLAGS_URL} BUILD_IN_SOURCE 1 CMAKE_ARGS ${GFLAGS_CMAKE_ARGS}) endif()
