Skip to content

Commit 81ce081

Browse files
wesmnealrichardson
authored andcommitted
ARROW-7450: [C++] Also link boost_filesystem when using static test linkage
The nightly test-ubuntu-18.04-cpp-static has been failing due to a missing Boost link dependency in the unit tests Closes #6130 from wesm/ARROW-7450 and squashes the following commits: 8984f41 <Wes McKinney> Remove whitespace bd802c3 <Wes McKinney> Also link boost_filesystem when using static test linkage Authored-by: Wes McKinney <[email protected]> Signed-off-by: Neal Richardson <[email protected]>
1 parent ddf0c62 commit 81ce081

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

cpp/CMakeLists.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -696,7 +696,12 @@ if(NOT MSVC)
696696
list(APPEND ARROW_SHARED_INSTALL_INTERFACE_LIBS ${CMAKE_DL_LIBS})
697697
endif()
698698

699-
set(ARROW_TEST_LINK_TOOLCHAIN GTest::Main GTest::GTest GTest::GMock)
699+
set(ARROW_TEST_LINK_TOOLCHAIN
700+
GTest::Main
701+
GTest::GTest
702+
GTest::GMock
703+
${BOOST_FILESYSTEM_LIBRARY}
704+
${BOOST_SYSTEM_LIBRARY})
700705

701706
if(ARROW_BUILD_TESTS)
702707
add_dependencies(arrow_test_dependencies ${ARROW_TEST_LINK_TOOLCHAIN})
@@ -711,13 +716,8 @@ endif()
711716
set(ARROW_TEST_STATIC_LINK_LIBS arrow_testing_static arrow_static ${ARROW_LINK_LIBS}
712717
${ARROW_TEST_LINK_TOOLCHAIN})
713718

714-
set(ARROW_TEST_SHARED_LINK_LIBS
715-
arrow_testing_shared
716-
arrow_shared
717-
${ARROW_LINK_LIBS}
718-
${BOOST_FILESYSTEM_LIBRARY}
719-
${BOOST_SYSTEM_LIBRARY}
720-
${ARROW_TEST_LINK_TOOLCHAIN})
719+
set(ARROW_TEST_SHARED_LINK_LIBS arrow_testing_shared arrow_shared ${ARROW_LINK_LIBS}
720+
${ARROW_TEST_LINK_TOOLCHAIN})
721721

722722
if(NOT MSVC)
723723
set(ARROW_TEST_SHARED_LINK_LIBS ${ARROW_TEST_SHARED_LINK_LIBS} ${CMAKE_DL_LIBS})

0 commit comments

Comments
 (0)