You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@parquet.apache.org by we...@apache.org on 2017/04/10 16:06:24 UTC
parquet-cpp git commit: PARQUET-949: Pin Arrow version using git
archives instead of GIT_TAG
Repository: parquet-cpp
Updated Branches:
refs/heads/master cf31e6d1b -> 6b22b4685
PARQUET-949: Pin Arrow version using git archives instead of GIT_TAG
There has been some flakiness with this on PRs today, so this should help prevent accidentally building against master
Author: Wes McKinney <we...@twosigma.com>
Closes #294 from wesm/PARQUET-949 and squashes the following commits:
95b0f8a [Wes McKinney] Fix odd variable scope issue
095cbe3 [Wes McKinney] Pin Arrow version using git archives instead of GIT_TAG
Project: http://git-wip-us.apache.org/repos/asf/parquet-cpp/repo
Commit: http://git-wip-us.apache.org/repos/asf/parquet-cpp/commit/6b22b468
Tree: http://git-wip-us.apache.org/repos/asf/parquet-cpp/tree/6b22b468
Diff: http://git-wip-us.apache.org/repos/asf/parquet-cpp/diff/6b22b468
Branch: refs/heads/master
Commit: 6b22b46851b741b7299b1d3ac536379034f6bbc8
Parents: cf31e6d
Author: Wes McKinney <we...@twosigma.com>
Authored: Mon Apr 10 12:06:18 2017 -0400
Committer: Wes McKinney <we...@twosigma.com>
Committed: Mon Apr 10 12:06:18 2017 -0400
----------------------------------------------------------------------
cmake_modules/ThirdpartyToolchain.cmake | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/6b22b468/cmake_modules/ThirdpartyToolchain.cmake
----------------------------------------------------------------------
diff --git a/cmake_modules/ThirdpartyToolchain.cmake b/cmake_modules/ThirdpartyToolchain.cmake
index 1294f46..349be7d 100644
--- a/cmake_modules/ThirdpartyToolchain.cmake
+++ b/cmake_modules/ThirdpartyToolchain.cmake
@@ -22,7 +22,6 @@ set(THRIFT_VERSION "0.10.0")
# Brotli 0.5.2 does not install headers/libraries yet, but 0.6.0.dev does
set(BROTLI_VERSION "5db62dcc9d386579609540cdf8869e95ad334bbd")
-set(ARROW_VERSION "c2f28cd07413e262fa0b741c286f86d5c7277c56")
# find boost headers and libs
set(Boost_DEBUG TRUE)
@@ -394,11 +393,13 @@ if (NOT ARROW_FOUND)
-DARROW_JEMALLOC=OFF
-DARROW_BUILD_TESTS=OFF)
+ set(ARROW_VERSION "c2f28cd07413e262fa0b741c286f86d5c7277c56")
+ set(ARROW_URL "https://github.com/apache/arrow/archive/${ARROW_VERSION}.tar.gz")
+
if (CMAKE_VERSION VERSION_GREATER "3.2")
# BUILD_BYPRODUCTS is a 3.2+ feature
ExternalProject_Add(arrow_ep
- GIT_REPOSITORY https://github.com/apache/arrow.git
- GIT_TAG ${ARROW_VERSION}
+ URL ${ARROW_URL}
BUILD_BYPRODUCTS "${ARROW_SHARED_LIB}" "${ARROW_STATIC_LIB}"
# With CMake 3.7.0 there is a SOURCE_SUBDIR argument which we can use
# to specify that the CMakeLists.txt of Arrow is located in cpp/
@@ -408,8 +409,7 @@ if (NOT ARROW_FOUND)
CMAKE_ARGS ${ARROW_CMAKE_ARGS})
else()
ExternalProject_Add(arrow_ep
- GIT_REPOSITORY https://github.com/apache/arrow.git
- GIT_TAG ${ARROW_VERSION}
+ URL ${ARROW_URL}
CONFIGURE_COMMAND "${CMAKE_COMMAND}" ${ARROW_CMAKE_ARGS} ${CMAKE_CURRENT_BINARY_DIR}/arrow_ep-prefix/src/arrow_ep/cpp
CMAKE_ARGS ${ARROW_CMAKE_ARGS})
endif()