Эх сурвалжийг харах

externals: auto detect system OpenSSL

liushuyu 5 жил өмнө
parent
commit
eb84e0f63a

+ 0 - 2
CMakeLists.txt

@@ -30,8 +30,6 @@ option(ENABLE_VULKAN "Enables Vulkan backend" ON)
 
 option(USE_DISCORD_PRESENCE "Enables Discord Rich Presence" OFF)
 
-option(USE_SYSTEM_SSL "Use system provided SSL library" OFF)
-
 # Default to a Release build
 get_property(IS_MULTI_CONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
 if (NOT IS_MULTI_CONFIG AND NOT CMAKE_BUILD_TYPE)

+ 2 - 2
externals/CMakeLists.txt

@@ -73,8 +73,8 @@ if (NOT LIBZIP_FOUND)
 endif()
 
 if (ENABLE_WEB_SERVICE)
-    if (USE_SYSTEM_SSL)
-        find_package(OpenSSL 1.1 REQUIRED)
+    find_package(OpenSSL 1.1)
+    if (OPENSSL_FOUND)
         set(OPENSSL_LIBRARIES OpenSSL::SSL OpenSSL::Crypto)
     else()
         # LibreSSL