raulcd commented on code in PR #46912:
URL: https://github.com/apache/arrow/pull/46912#discussion_r2189295651
##########
cpp/cmake_modules/ThirdpartyToolchain.cmake:
##########
@@ -1052,119 +1045,130 @@ endif()
# ----------------------------------------------------------------------
# Add Boost dependencies (code adapted from Apache Kudu)
-macro(build_boost)
- set(BOOST_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/boost_ep-prefix/src/boost_ep")
+function(build_boost)
+ list(APPEND CMAKE_MESSAGE_INDENT "Boost: ")
+ message(STATUS "Building from source")
- # This is needed by the thrift_ep build
- set(BOOST_ROOT ${BOOST_PREFIX})
- set(Boost_INCLUDE_DIR "${BOOST_PREFIX}")
+ fetchcontent_declare(boost
+ ${FC_DECLARE_COMMON_OPTIONS} OVERRIDE_FIND_PACKAGE
+ URL ${BOOST_SOURCE_URL}
+ URL_HASH "SHA256=${ARROW_BOOST_BUILD_SHA256_CHECKSUM}")
- if(ARROW_BOOST_REQUIRE_LIBRARY)
- set(BOOST_LIB_DIR "${BOOST_PREFIX}/stage/lib")
- set(BOOST_BUILD_LINK "static")
- if("${UPPERCASE_BUILD_TYPE}" STREQUAL "DEBUG")
- set(BOOST_BUILD_VARIANT "debug")
- else()
- set(BOOST_BUILD_VARIANT "release")
+ prepare_fetchcontent()
+ set(BOOST_ENABLE_COMPATIBILITY_TARGETS ON)
+ set(BOOST_EXCLUDE_LIBRARIES)
+ set(BOOST_INCLUDE_LIBRARIES
+ ${ARROW_BOOST_COMPONENTS}
+ ${ARROW_BOOST_OPTIONAL_COMPONENTS}
+ algorithm
+ crc
+ numeric/conversion
+ scope_exit
+ throw_exception
+ tokenizer)
+ if(ARROW_TESTING
+ OR ARROW_GANDIVA
+ OR (NOT ARROW_USE_NATIVE_INT128))
+ set(ARROW_BOOST_NEED_MULTIPRECISION TRUE)
+ else()
+ set(ARROW_BOOST_NEED_MULTIPRECISION FALSE)
+ endif()
+ if(ARROW_ENABLE_THREADING)
+ if(ARROW_WITH_THRIFT OR (ARROW_FLIGHT_SQL_ODBC AND MSVC))
+ list(APPEND BOOST_INCLUDE_LIBRARIES locale)
endif()
- if(MSVC)
- set(BOOST_CONFIGURE_COMMAND ".\\\\bootstrap.bat")
- else()
- set(BOOST_CONFIGURE_COMMAND "./bootstrap.sh")
+ if(ARROW_BOOST_NEED_MULTIPRECISION)
+ list(APPEND BOOST_INCLUDE_LIBRARIES multiprecision)
endif()
+ list(APPEND BOOST_INCLUDE_LIBRARIES thread)
+ else()
+ list(APPEND
+ BOOST_EXCLUDE_LIBRARIES
+ asio
+ container
+ date_time
+ lexical_cast
+ locale
+ lockfree
+ math
+ thread)
+ endif()
+ if(ARROW_WITH_THRIFT)
+ list(APPEND BOOST_INCLUDE_LIBRARIES uuid)
+ endif()
Review Comment:
Should we add `uuid` to `BOOST_EXCLUDE_LIBRARIES` otherwise?
##########
cpp/cmake_modules/ThirdpartyToolchain.cmake:
##########
@@ -1747,102 +1729,77 @@ endif()
# ----------------------------------------------------------------------
# Thrift
-macro(build_thrift)
- message(STATUS "Building Apache Thrift from source")
- set(THRIFT_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/thrift_ep-install")
- set(THRIFT_INCLUDE_DIR "${THRIFT_PREFIX}/include")
- set(THRIFT_CMAKE_ARGS
- ${EP_COMMON_CMAKE_ARGS}
- "-DCMAKE_INSTALL_PREFIX=${THRIFT_PREFIX}"
- "-DCMAKE_INSTALL_RPATH=${THRIFT_PREFIX}/lib"
- # Work around https://gitlab.kitware.com/cmake/cmake/issues/18865
- -DBoost_NO_BOOST_CMAKE=ON
- -DBUILD_COMPILER=OFF
- -DBUILD_EXAMPLES=OFF
- -DBUILD_TUTORIALS=OFF
- -DCMAKE_DEBUG_POSTFIX=
- -DWITH_AS3=OFF
- -DWITH_CPP=ON
- -DWITH_C_GLIB=OFF
- -DWITH_JAVA=OFF
- -DWITH_JAVASCRIPT=OFF
- -DWITH_LIBEVENT=OFF
- -DWITH_NODEJS=OFF
- -DWITH_PYTHON=OFF
- -DWITH_QT5=OFF
- -DWITH_ZLIB=OFF)
-
- # Thrift also uses boost. Forward important boost settings if there were
ones passed.
- if(DEFINED BOOST_ROOT)
- list(APPEND THRIFT_CMAKE_ARGS "-DBOOST_ROOT=${BOOST_ROOT}")
- endif()
- list(APPEND
- THRIFT_CMAKE_ARGS
-
"-DBoost_INCLUDE_DIR=$<TARGET_PROPERTY:Boost::headers,INTERFACE_INCLUDE_DIRECTORIES>"
- )
- if(DEFINED Boost_NAMESPACE)
- list(APPEND THRIFT_CMAKE_ARGS "-DBoost_NAMESPACE=${Boost_NAMESPACE}")
+function(build_thrift)
+ list(APPEND CMAKE_MESSAGE_INDENT "Thrift: ")
+ message(STATUS "Building from source")
+
+ if(CMAKE_VERSION VERSION_LESS 3.26)
+ message(FATAL_ERROR "Require CMake 3.26 or later for building bundled
Apache Thrift")
endif()
+ fetchcontent_declare(thrift
+ ${FC_DECLARE_COMMON_OPTIONS}
+ URL ${THRIFT_SOURCE_URL}
+ URL_HASH "SHA256=${ARROW_THRIFT_BUILD_SHA256_CHECKSUM}")
+ prepare_fetchcontent()
+ set(BUILD_COMPILER OFF)
+ set(BUILD_EXAMPLES OFF)
+ set(BUILD_TUTORIALS OFF)
+ set(CMAKE_UNITY_BUILD OFF)
+ set(WITH_AS3 OFF)
+ set(WITH_CPP ON)
+ set(WITH_C_GLIB OFF)
+ set(WITH_JAVA OFF)
+ set(WITH_JAVASCRIPT OFF)
+ set(WITH_LIBEVENT OFF)
if(MSVC)
if(ARROW_USE_STATIC_CRT)
- set(THRIFT_LIB_SUFFIX "mt")
- list(APPEND THRIFT_CMAKE_ARGS "-DWITH_MT=ON")
+ set(WITH_MT ON)
else()
- set(THRIFT_LIB_SUFFIX "md")
- list(APPEND THRIFT_CMAKE_ARGS "-DWITH_MT=OFF")
+ set(WITH_MT OFF)
endif()
- # NOTE(amoeba): When you bump Thrift to >=0.21.0, change bin to lib
- set(THRIFT_LIB
-
"${THRIFT_PREFIX}/bin/${CMAKE_IMPORT_LIBRARY_PREFIX}thrift${THRIFT_LIB_SUFFIX}${CMAKE_IMPORT_LIBRARY_SUFFIX}"
- )
- else()
- set(THRIFT_LIB
-
"${THRIFT_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}thrift${CMAKE_STATIC_LIBRARY_SUFFIX}"
- )
endif()
+ set(WITH_NODEJS OFF)
+ set(WITH_PYTHON OFF)
+ set(WITH_QT5 OFF)
+ set(WITH_ZLIB OFF)
- if(BOOST_VENDORED)
- set(THRIFT_DEPENDENCIES ${THRIFT_DEPENDENCIES} boost_ep)
- endif()
+ # Remove Apache Arrow's CMAKE_MODULE_PATH to ensure using Apache
+ # Thrift's cmake_modules/.
+ #
+ # We can remove this once https://github.com/apache/thrift/pull/3176
+ # is merged.
+ list(POP_FRONT CMAKE_MODULE_PATH)
Review Comment:
Don't we have to add it back afterwards?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscr...@arrow.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
