summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorliushuyu <liushuyu011@gmail.com>2020-10-27 21:20:20 +0100
committerliushuyu <liushuyu011@gmail.com>2020-10-27 21:20:20 +0100
commiteb84e0f63a28da64d17eea67eb532c3d9256b12f (patch)
treec5249d5875ab849499195d9a51ea306ffd6dd17f
parentweb_backend: fix a regression introduced in 39c8d18 (diff)
downloadyuzu-eb84e0f63a28da64d17eea67eb532c3d9256b12f.tar
yuzu-eb84e0f63a28da64d17eea67eb532c3d9256b12f.tar.gz
yuzu-eb84e0f63a28da64d17eea67eb532c3d9256b12f.tar.bz2
yuzu-eb84e0f63a28da64d17eea67eb532c3d9256b12f.tar.lz
yuzu-eb84e0f63a28da64d17eea67eb532c3d9256b12f.tar.xz
yuzu-eb84e0f63a28da64d17eea67eb532c3d9256b12f.tar.zst
yuzu-eb84e0f63a28da64d17eea67eb532c3d9256b12f.zip
-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)
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 b8114f42b..421b35890 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