summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar liushuyu2020-10-27 14:20:20 -0600
committerGravatar liushuyu2020-10-27 14:20:20 -0600
commiteb84e0f63a28da64d17eea67eb532c3d9256b12f (patch)
treec5249d5875ab849499195d9a51ea306ffd6dd17f
parentweb_backend: fix a regression introduced in 39c8d18 (diff)
downloadyuzu-eb84e0f63a28da64d17eea67eb532c3d9256b12f.tar.gz
yuzu-eb84e0f63a28da64d17eea67eb532c3d9256b12f.tar.xz
yuzu-eb84e0f63a28da64d17eea67eb532c3d9256b12f.zip
externals: auto detect system OpenSSL
Diffstat (limited to '')
-rw-r--r--CMakeLists.txt2
-rw-r--r--externals/CMakeLists.txt4
2 files changed, 2 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 366e86b7d..8e9502a97 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,8 +30,6 @@ option(ENABLE_VULKAN "Enables Vulkan backend" ON)
30 30
31option(USE_DISCORD_PRESENCE "Enables Discord Rich Presence" OFF) 31option(USE_DISCORD_PRESENCE "Enables Discord Rich Presence" OFF)
32 32
33option(USE_SYSTEM_SSL "Use system provided SSL library" OFF)
34
35# Default to a Release build 33# Default to a Release build
36get_property(IS_MULTI_CONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) 34get_property(IS_MULTI_CONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
37if (NOT IS_MULTI_CONFIG AND NOT CMAKE_BUILD_TYPE) 35if (NOT IS_MULTI_CONFIG AND NOT CMAKE_BUILD_TYPE)
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index b8114f42b..421b35890 100644
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@@ -73,8 +73,8 @@ if (NOT LIBZIP_FOUND)
73endif() 73endif()
74 74
75if (ENABLE_WEB_SERVICE) 75if (ENABLE_WEB_SERVICE)
76 if (USE_SYSTEM_SSL) 76 find_package(OpenSSL 1.1)
77 find_package(OpenSSL 1.1 REQUIRED) 77 if (OPENSSL_FOUND)
78 set(OPENSSL_LIBRARIES OpenSSL::SSL OpenSSL::Crypto) 78 set(OPENSSL_LIBRARIES OpenSSL::SSL OpenSSL::Crypto)
79 else() 79 else()
80 # LibreSSL 80 # LibreSSL