Skip to content

ARROW-16604: [C++] Remove needless Boost dependency from benchmarks #13192

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kou merged 2 commits into from
May 19, 2022
Merged

ARROW-16604: [C++] Remove needless Boost dependency from benchmarks #13192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
318d9b6
ARROW-16604: [C++] Remove needless Boost dependency from benchmarks
kou May 18, 2022
6c2381f
Remove obsolete todo
cyb70289 May 19, 2022
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
9 changes: 2 additions & 7 deletions cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -854,13 +854,8 @@ if(NOT MSVC_TOOLCHAIN)
list(APPEND ARROW_SHARED_INSTALL_INTERFACE_LIBS ${CMAKE_DL_LIBS})
endif()

set(ARROW_TEST_LINK_TOOLCHAIN
arrow::flatbuffers
GTest::gtest_main
GTest::gtest
GTest::gmock
Boost::filesystem
Boost::system)
set(ARROW_TEST_LINK_TOOLCHAIN arrow::flatbuffers GTest::gtest_main GTest::gtest
GTest::gmock)

if(ARROW_BUILD_TESTS)
add_dependencies(arrow_test_dependencies ${ARROW_TEST_LINK_TOOLCHAIN})
Expand Down
1 change: 0 additions & 1 deletion cpp/cmake_modules/DefineOptions.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,6 @@ if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")

define_option(ARROW_GCS
"Build Arrow with GCS support (requires the GCloud SDK for C++)" OFF)
mark_as_advanced(ARROW_GCS) # TODO(ARROW-1231) - remove once completed

define_option(ARROW_HDFS "Build the Arrow HDFS bridge" OFF)

Expand Down
18 changes: 15 additions & 3 deletions cpp/src/arrow/filesystem/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,12 @@ add_arrow_test(filesystem-test
filesystem)

if(ARROW_GCS)
add_arrow_test(gcsfs_test EXTRA_LABELS filesystem)
add_arrow_test(gcsfs_test
EXTRA_LABELS
filesystem
EXTRA_LINK_LIBS
Boost::filesystem
Boost::system)
endif()

if(ARROW_S3)
Expand All @@ -38,7 +43,10 @@ if(ARROW_S3)
s3fs_test.cc
s3_test_util.cc
EXTRA_LABELS
filesystem)
filesystem
EXTRA_LINK_LIBS
Boost::filesystem
Boost::system)
if(TARGET arrow-s3fs-test)
set(ARROW_S3FS_TEST_COMPILE_DEFINITIONS)
get_target_property(AWS_CPP_SDK_S3_TYPE aws-cpp-sdk-s3 TYPE)
Expand Down Expand Up @@ -73,7 +81,11 @@ if(ARROW_S3)
"arrow-filesystem"
SOURCES
s3fs_benchmark.cc
s3_test_util.cc)
s3_test_util.cc
STATIC_LINK_LIBS
${ARROW_BENCHMARK_LINK_LIBS}
Boost::filesystem
Boost::system)
if(ARROW_TEST_LINKAGE STREQUAL "static")
target_link_libraries(arrow-filesystem-s3fs-benchmark PRIVATE parquet_static)
else()
Expand Down
8 changes: 7 additions & 1 deletion cpp/src/arrow/io/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,13 @@ add_arrow_test(compressed_test PREFIX "arrow-io")
add_arrow_test(file_test PREFIX "arrow-io")

if(ARROW_HDFS)
add_arrow_test(hdfs_test NO_VALGRIND PREFIX "arrow-io")
add_arrow_test(hdfs_test
NO_VALGRIND
PREFIX
"arrow-io"
EXTRA_LINK_LIBS
Boost::filesystem
Boost::system)
endif()

add_arrow_test(memory_test PREFIX "arrow-io")
Expand Down