Skip to content

Commit d152824

Browse files
committed
curl/OpenSSL order fix
1 parent fe52c64 commit d152824

2 files changed

Lines changed: 20 additions & 2 deletions

File tree

‎cpp/src/arrow/ArrowConfig.cmake.in‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,15 @@ if(TARGET Arrow::arrow_static AND NOT TARGET Arrow::arrow_bundled_dependencies)
128128
)
129129
endforeach()
130130

131+
if(ARROW_BUNDLED_STATIC_LIBS)
132+
get_target_property(arrow_bundled_dependencies_link_libs Arrow::arrow_static
133+
INTERFACE_LINK_LIBRARIES)
134+
list(REMOVE_ITEM arrow_bundled_dependencies_link_libs
135+
Arrow::arrow_bundled_dependencies)
136+
target_link_libraries(Arrow::arrow_bundled_dependencies
137+
INTERFACE ${arrow_bundled_dependencies_link_libs})
138+
endif()
139+
131140
# CMP0057: Support new if() IN_LIST operator.
132141
# https://cmake.org/cmake/help/latest/policy/CMP0057.html
133142
cmake_policy(PUSH)

‎cpp/src/arrow/ArrowGcsConfig.cmake.in‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,19 @@ if(TARGET ArrowGcs::arrow_gcs_static
4242
AND ARROW_GCS_BUNDLED_STATIC_LIBS
4343
AND NOT TARGET ArrowGcs::arrow_gcs_bundled_dependencies)
4444
add_library(ArrowGcs::arrow_gcs_bundled_dependencies STATIC IMPORTED)
45+
get_target_property(arrow_gcs_bundled_dependencies_link_libs ArrowGcs::arrow_gcs_static
46+
INTERFACE_LINK_LIBRARIES)
47+
list(REMOVE_ITEM arrow_gcs_bundled_dependencies_link_libs
48+
ArrowGcs::arrow_gcs_bundled_dependencies Arrow::arrow_static)
4549
if("@absl_SOURCE@" STREQUAL "BUNDLED")
46-
target_link_libraries(ArrowGcs::arrow_gcs_bundled_dependencies
47-
INTERFACE Arrow::arrow_bundled_dependencies)
50+
list(APPEND arrow_gcs_bundled_dependencies_link_libs
51+
Arrow::arrow_bundled_dependencies)
4852
endif()
53+
if(NOT WIN32)
54+
list(APPEND arrow_gcs_bundled_dependencies_link_libs OpenSSL::Crypto)
55+
endif()
56+
target_link_libraries(ArrowGcs::arrow_gcs_bundled_dependencies
57+
INTERFACE ${arrow_gcs_bundled_dependencies_link_libs})
4958
get_target_property(arrow_gcs_static_configurations ArrowGcs::arrow_gcs_static
5059
IMPORTED_CONFIGURATIONS)
5160
foreach(CONFIGURATION ${arrow_gcs_static_configurations})

0 commit comments

Comments
 (0)