Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ci/conda_env_cpp.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ azure-storage-blobs-cpp>=12.10.0
azure-storage-common-cpp>=12.5.0
azure-storage-files-datalake-cpp>=12.9.0
benchmark>=1.6.0,!=1.8.4
boost-cpp>=1.68.0
brotli
bzip2
c-ares
Expand All @@ -32,6 +31,7 @@ glog
gmock>=1.10.0
google-cloud-cpp>=1.34.0
gtest>=1.10.0
libboost-devel
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks for this!

libgrpc
libprotobuf
libutf8proc
Expand Down
17 changes: 10 additions & 7 deletions cpp/cmake_modules/ThirdpartyToolchain.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -1191,18 +1191,24 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION
# GH-34094 Older versions of Boost use the deprecated std::unary_function in
# boost/container_hash/hash.hpp and support for that was removed in clang 16
set(ARROW_BOOST_REQUIRED_VERSION "1.81")
elseif(ARROW_BUILD_TESTS)
set(ARROW_BOOST_REQUIRED_VERSION "1.64")
else()
set(ARROW_BOOST_REQUIRED_VERSION "1.58")
# CentOS 7 uses Boost 1.69.
set(ARROW_BOOST_REQUIRED_VERSION "1.69")
endif()

set(Boost_USE_MULTITHREADED ON)
if(MSVC AND ARROW_USE_STATIC_CRT)
set(Boost_USE_STATIC_RUNTIME ON)
endif()
# CMake 3.25.0 has 1.80 and older versions.
#
# We can remove this once we require CMake 3.30.0 or later because we
# enable CMP0167 "The FindBoost module is removed."
# https://cmake.org/cmake/help/latest/policy/CMP0167.html with CMake
# 3.30.0 or later.
set(Boost_ADDITIONAL_VERSIONS
"1.89.0"
"1.89"
"1.88.0"
"1.88"
"1.87.0"
Expand Down Expand Up @@ -1273,7 +1279,7 @@ if(ARROW_USE_BOOST)
set(Boost_USE_STATIC_LIBS ON)
endif()
if(ARROW_BOOST_REQUIRE_LIBRARY)
set(ARROW_BOOST_COMPONENTS filesystem system)
set(ARROW_BOOST_COMPONENTS filesystem)
if(ARROW_FLIGHT_SQL_ODBC AND MSVC)
list(APPEND ARROW_BOOST_COMPONENTS locale)
endif()
Expand Down Expand Up @@ -1327,9 +1333,6 @@ if(ARROW_USE_BOOST)
if(TARGET Boost::filesystem)
target_link_libraries(arrow::Boost::process INTERFACE Boost::filesystem)
endif()
if(TARGET Boost::system)
target_link_libraries(arrow::Boost::process INTERFACE Boost::system)
endif()
if(TARGET Boost::headers)
target_link_libraries(arrow::Boost::process INTERFACE Boost::headers)
endif()
Expand Down
5 changes: 2 additions & 3 deletions cpp/src/arrow/filesystem/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -132,12 +132,11 @@ if(ARROW_S3)
DEFINITIONS
ARROW_S3_LIBPATH="$<TARGET_FILE:arrow_s3fs>"
EXTRA_LINK_LIBS
Boost::filesystem
Boost::system)
Boost::filesystem)
target_compile_definitions(arrow-filesystem-test
PUBLIC ARROW_S3_LIBPATH="$<TARGET_FILE:arrow_s3fs>")
target_sources(arrow-filesystem-test PUBLIC s3fs_module_test.cc s3_test_util.cc)
target_link_libraries(arrow-filesystem-test PUBLIC Boost::filesystem Boost::system)
target_link_libraries(arrow-filesystem-test PUBLIC Boost::filesystem)
endif()
endif()

Expand Down
Loading