This is an automated email from the ASF dual-hosted git repository.
kou pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/master by this push:
new 76d3c36 ARROW-8049: [C++] Bump thrift to 0.13 and require cmake 3.10
for it
76d3c36 is described below
commit 76d3c36006162766ec598442a0c0d2192f5e0d0b
Author: Neal Richardson <[email protected]>
AuthorDate: Tue Mar 9 12:26:09 2021 +0900
ARROW-8049: [C++] Bump thrift to 0.13 and require cmake 3.10 for it
See https://github.com/apache/arrow/pull/9483#issuecomment-792322123
Closes #9658 from nealrichardson/try-thrift-13-again
Authored-by: Neal Richardson <[email protected]>
Signed-off-by: Sutou Kouhei <[email protected]>
---
cpp/cmake_modules/ThirdpartyToolchain.cmake | 6 ++++--
cpp/thirdparty/versions.txt | 6 ++----
r/tools/linuxlibs.R | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake
b/cpp/cmake_modules/ThirdpartyToolchain.cmake
index f479335..559257f 100644
--- a/cpp/cmake_modules/ThirdpartyToolchain.cmake
+++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake
@@ -1238,6 +1238,10 @@ endif()
# Thrift
macro(build_thrift)
+ if(CMAKE_VERSION VERSION_LESS 3.10)
+ message(
+ FATAL_ERROR "Building thrift using ExternalProject requires at least
CMake 3.10")
+ endif()
message("Building Apache Thrift from source")
set(THRIFT_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/thrift_ep-install")
set(THRIFT_INCLUDE_DIR "${THRIFT_PREFIX}/include")
@@ -1247,8 +1251,6 @@ macro(build_thrift)
"-DCMAKE_INSTALL_RPATH=${THRIFT_PREFIX}/lib"
-DBUILD_COMPILER=OFF
-DBUILD_SHARED_LIBS=OFF
- # DWITH_SHARED_LIB is removed in 0.13
- -DWITH_SHARED_LIB=OFF
-DBUILD_TESTING=OFF
-DBUILD_EXAMPLES=OFF
-DBUILD_TUTORIALS=OFF
diff --git a/cpp/thirdparty/versions.txt b/cpp/thirdparty/versions.txt
index 794dcc8..21d6da2 100644
--- a/cpp/thirdparty/versions.txt
+++ b/cpp/thirdparty/versions.txt
@@ -51,10 +51,8 @@ ARROW_PROTOBUF_BUILD_VERSION=v3.14.0
ARROW_RAPIDJSON_BUILD_VERSION=1a803826f1197b5e30703afe4b9c0e7dd48074f5
ARROW_RE2_BUILD_VERSION=2021-02-02
ARROW_SNAPPY_BUILD_VERSION=1.1.8
-# We can't upgrade to thrift 0.13 because it requires cmake 3.10 and we support
-# older than that (ARROW-8049, THRIFT-5137)
-ARROW_THRIFT_BUILD_VERSION=0.12.0
-ARROW_THRIFT_BUILD_MD5_CHECKSUM=3deebbb4d1ca77dd9c9e009a1ea02183
+ARROW_THRIFT_BUILD_VERSION=0.13.0
+ARROW_THRIFT_BUILD_MD5_CHECKSUM=38a27d391a2b03214b444cb13d5664f1
ARROW_UTF8PROC_BUILD_VERSION=v2.6.1
# For https://github.com/xtensor-stack/xsimd/pull/419
ARROW_XSIMD_BUILD_VERSION=e916f3ab1bc513328b627df702226a1d1e2ae3a9
diff --git a/r/tools/linuxlibs.R b/r/tools/linuxlibs.R
index 0dab4b3..b652922 100644
--- a/r/tools/linuxlibs.R
+++ b/r/tools/linuxlibs.R
@@ -368,7 +368,7 @@ ensure_cmake <- function() {
cmake
}
-find_cmake <- function(paths, version_required = 3.2) {
+find_cmake <- function(paths, version_required = 3.10) {
# Given a list of possible cmake paths, return the first one that exists and
is new enough
for (path in paths) {
if (nzchar(path) && cmake_version(path) >= version_required) {
