35 lines
1.4 KiB
Diff
35 lines
1.4 KiB
Diff
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||
|
|
index 5638fb9..6e24c74 100644
|
||
|
|
--- a/CMakeLists.txt
|
||
|
|
+++ b/CMakeLists.txt
|
||
|
|
@@ -113,16 +113,8 @@ endif()
|
||
|
|
# Threads needed for <thread> on some systems, and for <pthread.h> on Linux
|
||
|
|
set(THREADS_PREFER_PTHREAD_FLAG true)
|
||
|
|
find_package(Threads REQUIRED)
|
||
|
|
-# Since Cmake v3.11, Crypto & SSL became optional when not specified as COMPONENTS.
|
||
|
|
-if(HTTPLIB_REQUIRE_OPENSSL)
|
||
|
|
- find_package(OpenSSL ${_HTTPLIB_OPENSSL_MIN_VER} COMPONENTS Crypto SSL REQUIRED)
|
||
|
|
-elseif(HTTPLIB_USE_OPENSSL_IF_AVAILABLE)
|
||
|
|
- find_package(OpenSSL ${_HTTPLIB_OPENSSL_MIN_VER} COMPONENTS Crypto SSL QUIET)
|
||
|
|
-endif()
|
||
|
|
-# Just setting this variable here for people building in-tree
|
||
|
|
-if(OPENSSL_FOUND AND NOT DEFINED HTTPLIB_IS_USING_OPENSSL)
|
||
|
|
- set(HTTPLIB_IS_USING_OPENSSL TRUE)
|
||
|
|
-endif()
|
||
|
|
+
|
||
|
|
+set(HTTPLIB_IS_USING_OPENSSL TRUE)
|
||
|
|
|
||
|
|
if(HTTPLIB_REQUIRE_ZLIB)
|
||
|
|
find_package(ZLIB REQUIRED)
|
||
|
|
@@ -227,8 +219,8 @@ target_link_libraries(${PROJECT_NAME} ${_INTERFACE_OR_PUBLIC}
|
||
|
|
$<$<BOOL:${HTTPLIB_IS_USING_BROTLI}>:Brotli::encoder>
|
||
|
|
$<$<BOOL:${HTTPLIB_IS_USING_BROTLI}>:Brotli::decoder>
|
||
|
|
$<$<BOOL:${HTTPLIB_IS_USING_ZLIB}>:ZLIB::ZLIB>
|
||
|
|
- $<$<BOOL:${HTTPLIB_IS_USING_OPENSSL}>:OpenSSL::SSL>
|
||
|
|
- $<$<BOOL:${HTTPLIB_IS_USING_OPENSSL}>:OpenSSL::Crypto>
|
||
|
|
+ $<$<BOOL:${HTTPLIB_IS_USING_OPENSSL}>:ssl>
|
||
|
|
+ $<$<BOOL:${HTTPLIB_IS_USING_OPENSSL}>:crypto>
|
||
|
|
)
|
||
|
|
|
||
|
|
# Set the definitions to enable optional features
|