yuzu-emu
/
yuzu
Archived
1
0
Fork 0
Code

externals: auto detect system OpenSSL

This commit is contained in:
liushuyu 2020-10-27 14:20:20 -06:00
parent 8e673cbb08
commit eb84e0f63a
No known key found for this signature in database
GPG Key ID: 23D1CE4534419437
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

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

4
externals/CMakeLists.txt vendored
View File

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