File tree Expand file tree Collapse file tree 4 files changed +13
-17
lines changed
Expand file tree Collapse file tree 4 files changed +13
-17
lines changed Original file line number Diff line number Diff line change @@ -205,18 +205,7 @@ if(AX_WITH_JPEG AND NOT WINRT AND NOT EMSCRIPTEN)
205205 ax_add_3rd (jpeg-turbo )
206206endif ()
207207
208- add_subdirectory (openssl )
209-
210- if (ANDROID OR LINUX )
211- target_link_libraries (OpenSSL::SSL INTERFACE OpenSSL::Crypto )
212- target_link_libraries (3rdparty INTERFACE OpenSSL::SSL )
213- else ()
214- target_link_libraries (3rdparty
215- INTERFACE OpenSSL::Crypto
216- INTERFACE OpenSSL::SSL )
217- endif ()
218-
219- target_compile_definitions (3rdparty INTERFACE OPENSSL_SUPPRESS_DEPRECATED=1 )
208+ ax_add_3rd (openssl TARGETS OpenSSL::SSL )
220209
221210if (AX_WITH_WEBP)
222211 ax_add_3rd (webp )
@@ -260,10 +249,6 @@ endif()
260249
261250if (AX_WITH_CURL AND NOT EMSCRIPTEN)
262251 ax_add_3rd (curl )
263-
264- if (ANDROID OR LINUX )
265- target_link_libraries (curl INTERFACE OpenSSL::SSL )
266- endif ()
267252endif ()
268253
269254if (AX_ENABLE_AUDIO)
Original file line number Diff line number Diff line change 2929 IMPORTED_LOCATION "${curl_LIB_DIR} /lib${lib_name} .a"
3030 )
3131endif ()
32+
33+ if (ANDROID OR LINUX )
34+ target_link_libraries (curl INTERFACE OpenSSL::SSL )
35+ endif ()
Original file line number Diff line number Diff line change @@ -55,3 +55,7 @@ set_openssl_sub_target(${target_name})
5555# -----sub target 2: crypto-----
5656set (target_name OpenSSL::Crypto crypto)
5757set_openssl_sub_target (${target_name} )
58+
59+ # Ensure OpenSSL::SSL automatically propagates its dependency on OpenSSL::Crypto
60+ target_link_libraries (OpenSSL::SSL INTERFACE OpenSSL::Crypto )
61+ target_compile_definitions (OpenSSL::SSL INTERFACE OPENSSL_SUPPRESS_DEPRECATED=1 )
Original file line number Diff line number Diff line change 1-
21set (lib_name yasio)
32set (target_name ${lib_name} )
43
@@ -40,3 +39,7 @@ if(kcp_SOURCE_DIR)
4039 target_compile_definitions (${target_name} PUBLIC YASIO_ENABLE_KCP=1 )
4140 target_include_directories (${target_name} PUBLIC ${kcp_SOURCE_DIR} )
4241endif ()
42+
43+ if (ANDROID OR LINUX )
44+ target_link_libraries (yasio INTERFACE OpenSSL::SSL )
45+ endif ()
You can’t perform that action at this time.
0 commit comments