Skip to content

ARROW-16601: [C++][FlightRPC] Don't enforcing static link with static GoogleTest for arrow_flight_testing #13180

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 1 commit into from
May 18, 2022
Merged

ARROW-16601: [C++][FlightRPC] Don't enforcing static link with static GoogleTest for arrow_flight_testing #13180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 1 addition & 4 deletions cpp/cmake_modules/ThirdpartyToolchain.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2059,10 +2059,7 @@ if(ARROW_TESTING)
# We can't find shred library version of GoogleTest on Windows with
# Conda's gtest package because it doesn't provide GTestConfig.cmake
# provided by GoogleTest and CMake's built-in FindGTtest.cmake
# doesn't support gtest_dll.dll. If we find static library version
# of GoogleTest and ARROW_BUILD_SHARED=ON/ARROW_BUILD_STATIC=OFF are
# specified, we need to build arrow_flight_testing as a static
# library. See cpp/src/arrow/flight/CMakeLists.txt for details.
# doesn't support gtest_dll.dll.
resolve_dependency(GTest
REQUIRED_VERSION
1.10.0
Expand Down
33 changes: 3 additions & 30 deletions cpp/src/arrow/flight/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,29 +34,6 @@ if(NOT ARROW_GRPC_USE_SHARED)
message(STATUS "Linking Arrow Flight tests statically due to static gRPC")
set(ARROW_FLIGHT_TEST_LINKAGE "static")
endif()
if(ARROW_TESTING)
if(WIN32)
# We need to use the same library type for arrow_flight_testing
# and Google Test because arrow_flight_testing has
# arrow::flight:FlightTest that inherits testing::Test. If
# arrow_flight_testing's library type and gtest's library type are
# different such as arrow_flight_testing is a shared library and
# gtest is a static library, link error is occurred.
get_target_property(GTEST_TYPE GTest::gtest TYPE)
if(GTEST_TYPE STREQUAL "SHARED_LIBRARY")
set(ARROW_FLIGHT_TESTING_BUILD_SHARED TRUE)
set(ARROW_FLIGHT_TESTING_BUILD_STATIC FALSE)
else()
set(ARROW_FLIGHT_TESTING_BUILD_SHARED FALSE)
set(ARROW_FLIGHT_TESTING_BUILD_STATIC TRUE)
message(STATUS "Linking Arrow Flight tests statically due to static GTest")
set(ARROW_FLIGHT_TEST_LINKAGE "static")
endif()
else()
set(ARROW_FLIGHT_TESTING_BUILD_SHARED ${ARROW_BUILD_SHARED})
set(ARROW_FLIGHT_TESTING_BUILD_STATIC ${ARROW_BUILD_STATIC})
endif()
endif()

set(ARROW_FLIGHT_TEST_INTERFACE_LIBS)
if(ARROW_FLIGHT_TEST_LINKAGE STREQUAL "static")
Expand Down Expand Up @@ -280,10 +257,6 @@ if(ARROW_TESTING)
list(APPEND ARROW_FLIGHT_TESTING_SHARED_LINK_LIBS ${ARROW_FLIGHT_TEST_INTERFACE_LIBS})
list(APPEND ARROW_FLIGHT_TESTING_STATIC_LINK_LIBS ${ARROW_FLIGHT_TEST_INTERFACE_LIBS})
add_arrow_lib(arrow_flight_testing
BUILD_SHARED
${ARROW_FLIGHT_TESTING_BUILD_SHARED}
BUILD_STATIC
${ARROW_FLIGHT_TESTING_BUILD_STATIC}
CMAKE_PACKAGE_NAME
ArrowFlightTesting
PKG_CONFIG_NAME
Expand Down Expand Up @@ -325,7 +298,7 @@ add_arrow_test(flight_test
if(ARROW_BUILD_TESTS OR ARROW_BUILD_BENCHMARKS)
add_executable(flight-test-server test_server.cc)
target_link_libraries(flight-test-server ${ARROW_FLIGHT_TEST_LINK_LIBS}
${GFLAGS_LIBRARIES} GTest::gtest)
${GFLAGS_LIBRARIES})

if(ARROW_BUILD_TESTS)
add_dependencies(arrow-flight-test flight-test-server)
Expand All @@ -346,11 +319,11 @@ if(ARROW_BUILD_BENCHMARKS)

add_executable(arrow-flight-perf-server perf_server.cc perf.pb.cc)
target_link_libraries(arrow-flight-perf-server ${ARROW_FLIGHT_TEST_LINK_LIBS}
${GFLAGS_LIBRARIES} GTest::gtest)
${GFLAGS_LIBRARIES})

add_executable(arrow-flight-benchmark flight_benchmark.cc perf.pb.cc)
target_link_libraries(arrow-flight-benchmark ${ARROW_FLIGHT_TEST_LINK_LIBS}
${GFLAGS_LIBRARIES} GTest::gtest)
${GFLAGS_LIBRARIES})

add_dependencies(arrow-flight-benchmark arrow-flight-perf-server)

Expand Down