Fix linking statically against OpenSSL
`set(… PARENT_SCOPE)` leaves the current scope unaffected so appending the static dependencies removed the OpenSSL libs themselves again.
This commit is contained in:
parent
5291c746df
commit
eace9b44ec
|
@ -164,18 +164,17 @@ function (use_openssl)
|
||||||
return()
|
return()
|
||||||
endif ()
|
endif ()
|
||||||
message(STATUS "Found OpenSSL")
|
message(STATUS "Found OpenSSL")
|
||||||
set("${ARGS_LIBRARIES_VARIABLE}"
|
set("${ARGS_LIBRARIES_VARIABLE}" "${${ARGS_LIBRARIES_VARIABLE}};OpenSSL::SSL;OpenSSL::Crypto")
|
||||||
"${${ARGS_LIBRARIES_VARIABLE}};OpenSSL::SSL;OpenSSL::Crypto"
|
if (WIN32 AND OPENSSL_USE_STATIC_LIBS)
|
||||||
PARENT_SCOPE)
|
# FIXME: preferably use pkg-config to cover this case without hardcoding OpenSSL's dependencies under Windows
|
||||||
|
set("${ARGS_LIBRARIES_VARIABLE}" "${${ARGS_LIBRARIES_VARIABLE}};-lws2_32;-lgdi32;-lcrypt32")
|
||||||
|
endif ()
|
||||||
set("${ARGS_PACKAGES_VARIABLE}"
|
set("${ARGS_PACKAGES_VARIABLE}"
|
||||||
"${${ARGS_PACKAGES_VARIABLE}};OpenSSL"
|
"${${ARGS_PACKAGES_VARIABLE}};OpenSSL"
|
||||||
PARENT_SCOPE)
|
PARENT_SCOPE)
|
||||||
if (WIN32 AND OPENSSL_USE_STATIC_LIBS)
|
set("${ARGS_LIBRARIES_VARIABLE}"
|
||||||
# FIXME: preferably use pkg-config to cover this case without hardcoding OpenSSL's dependencies under Windows
|
"${${ARGS_LIBRARIES_VARIABLE}}"
|
||||||
set("${ARGS_LIBRARIES_VARIABLE}"
|
PARENT_SCOPE)
|
||||||
"${${ARGS_LIBRARIES_VARIABLE}};-lws2_32;-lgdi32;-lcrypt32"
|
|
||||||
PARENT_SCOPE)
|
|
||||||
endif ()
|
|
||||||
set("PKG_CONFIG_OpenSSL_SSL"
|
set("PKG_CONFIG_OpenSSL_SSL"
|
||||||
"libssl"
|
"libssl"
|
||||||
PARENT_SCOPE)
|
PARENT_SCOPE)
|
||||||
|
@ -197,17 +196,16 @@ function (use_crypto)
|
||||||
return()
|
return()
|
||||||
endif ()
|
endif ()
|
||||||
message(STATUS "Found OpenSSL")
|
message(STATUS "Found OpenSSL")
|
||||||
set("${ARGS_LIBRARIES_VARIABLE}"
|
set("${ARGS_LIBRARIES_VARIABLE}" "${${ARGS_LIBRARIES_VARIABLE}};OpenSSL::Crypto")
|
||||||
"${${ARGS_LIBRARIES_VARIABLE}};OpenSSL::Crypto"
|
if (WIN32 AND OPENSSL_USE_STATIC_LIBS)
|
||||||
PARENT_SCOPE)
|
set("${ARGS_LIBRARIES_VARIABLE}" "${${ARGS_LIBRARIES_VARIABLE}};-lws2_32;-lgdi32;-lcrypt32")
|
||||||
|
endif ()
|
||||||
set("${ARGS_PACKAGES_VARIABLE}"
|
set("${ARGS_PACKAGES_VARIABLE}"
|
||||||
"${${ARGS_PACKAGES_VARIABLE}};OpenSSL"
|
"${${ARGS_PACKAGES_VARIABLE}};OpenSSL"
|
||||||
PARENT_SCOPE)
|
PARENT_SCOPE)
|
||||||
if (WIN32 AND OPENSSL_USE_STATIC_LIBS)
|
set("${ARGS_LIBRARIES_VARIABLE}"
|
||||||
set("${ARGS_LIBRARIES_VARIABLE}"
|
"${${ARGS_LIBRARIES_VARIABLE}}"
|
||||||
"${${ARGS_LIBRARIES_VARIABLE}};OpenSSL::Crypto;-lws2_32;-lgdi32;-lcrypt32"
|
PARENT_SCOPE)
|
||||||
PARENT_SCOPE)
|
|
||||||
endif ()
|
|
||||||
set("PKG_CONFIG_OpenSSL_Crypto"
|
set("PKG_CONFIG_OpenSSL_Crypto"
|
||||||
"libcrypto"
|
"libcrypto"
|
||||||
PARENT_SCOPE)
|
PARENT_SCOPE)
|
||||||
|
|
Loading…
Reference in New Issue