@@ -73,9 +73,9 @@ if(ARROW_S3)
7373 # static variables storage of AWS SDK for C++ in libaws*.a may be
7474 # mixed with one in libarrow.
7575 if (ARROW_TEST_LINKAGE STREQUAL "shared" )
76- list (APPEND ARROW_S3_TEST_EXTRA_LINK_LIBS arrow_shared )
76+ list (APPEND ARROW_S3_TEST_EXTRA_LINK_LIBS arrow_s3_shared )
7777 else ()
78- list (APPEND ARROW_S3_TEST_EXTRA_LINK_LIBS arrow_static )
78+ list (APPEND ARROW_S3_TEST_EXTRA_LINK_LIBS arrow_s3_static )
7979 endif ()
8080 list (APPEND ARROW_S3_TEST_EXTRA_LINK_LIBS ${AWSSDK_LINK_LIBRARIES} )
8181 add_arrow_test (s3fs_test
@@ -107,7 +107,7 @@ if(ARROW_S3)
107107 if (ARROW_BUILD_TESTS)
108108 add_executable (arrow-s3fs-narrative-test s3fs_narrative_test.cc )
109109 target_link_libraries (arrow-s3fs-narrative-test ${ARROW_TEST_LINK_LIBS}
110- ${GFLAGS_LIBRARIES} )
110+ ${ARROW_S3_TEST_EXTRA_LINK_LIBS} ${ GFLAGS_LIBRARIES} )
111111 add_dependencies (arrow-tests arrow-s3fs-narrative-test )
112112 endif ()
113113
@@ -119,6 +119,7 @@ if(ARROW_S3)
119119 s3fs_benchmark.cc
120120 s3_test_util.cc
121121 STATIC_LINK_LIBS
122+ ${ARROW_S3_TEST_EXTRA_LINK_LIBS}
122123 ${AWSSDK_LINK_LIBRARIES}
123124 ${ARROW_BENCHMARK_LINK_LIBS} )
124125 if (ARROW_TEST_LINKAGE STREQUAL "static" )
@@ -128,19 +129,19 @@ if(ARROW_S3)
128129 endif ()
129130 endif ()
130131
131- if (ARROW_S3_MODULE AND ARROW_BUILD_TESTS)
132+ if (ARROW_BUILD_TESTS)
132133 add_arrow_test (s3fs_module_test
133134 SOURCES
134135 s3fs_module_test.cc
135136 s3_test_util.cc
136137 EXTRA_LABELS
137138 filesystem
138139 DEFINITIONS
139- ARROW_S3_LIBPATH= "$<TARGET_FILE :arrow_s3fs >"
140+ ARROW_S3_LIBPATH= "$<TARGET_FILE :arrow_s3_shared >"
140141 EXTRA_LINK_LIBS
141142 Boost::filesystem )
142143 target_compile_definitions (arrow-filesystem-test
143- PUBLIC ARROW_S3_LIBPATH= "$<TARGET_FILE :arrow_s3fs >" )
144+ PUBLIC ARROW_S3_LIBPATH= "$<TARGET_FILE :arrow_s3_shared >" )
144145 target_sources (arrow-filesystem-test PUBLIC s3fs_module_test.cc s3_test_util.cc )
145146 target_link_libraries (arrow-filesystem-test PUBLIC Boost::filesystem )
146147 endif ()
0 commit comments