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 on some systems, and for 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} $<$:Brotli::encoder> $<$:Brotli::decoder> $<$:ZLIB::ZLIB> - $<$:OpenSSL::SSL> - $<$:OpenSSL::Crypto> + $<$:ssl> + $<$:crypto> ) # Set the definitions to enable optional features