From eb84e0f63a28da64d17eea67eb532c3d9256b12f Mon Sep 17 00:00:00 2001
From: liushuyu <liushuyu011@gmail.com>
Date: Tue, 27 Oct 2020 14:20:20 -0600
Subject: [PATCH] externals: auto detect system OpenSSL
---
CMakeLists.txt | 2 --
externals/CMakeLists.txt | 4 ++--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 366e86b7da..8e9502a974 100644
--- a/CMakeLists.txt
+++ b/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)
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index b8114f42ba..421b358909 100644
--- a/externals/CMakeLists.txt
+++ b/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