diff options
| author |  bunnei | 2022-11-25 00:39:16 -0800 |
|---|---|---|
| committer |  GitHub | 2022-11-25 00:39:16 -0800 |
| commit | 2572b0a5ea615369c61c6dfac8a60c95d16495fe (patch) | |
| tree | 1c96112aadf3f5e9ba5b3457d46527b0fd1f1815 | |
| parent | Merge pull request #9304 from liamwhite/menu-roll (diff) | |
| parent | externals: always use LibreSSL on Windows (diff) | |
| download | yuzu-2572b0a5ea615369c61c6dfac8a60c95d16495fe.tar.gz yuzu-2572b0a5ea615369c61c6dfac8a60c95d16495fe.tar.xz yuzu-2572b0a5ea615369c61c6dfac8a60c95d16495fe.zip | |
Merge pull request #9302 from liamwhite/why-are-we-still-using-ado
externals: always use LibreSSL on Windows
| -rw-r--r-- | externals/CMakeLists.txt | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index 7f0a6d069..d807ef65f 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt | |||
| @@ -92,10 +92,14 @@ endif() | |||
| 92 | add_subdirectory(sirit) | 92 | add_subdirectory(sirit) |
| 93 | 93 | ||
| 94 | if (ENABLE_WEB_SERVICE) | 94 | if (ENABLE_WEB_SERVICE) |
| 95 | find_package(OpenSSL 1.1) | 95 | if (NOT WIN32) |
| 96 | if (OPENSSL_FOUND) | 96 | find_package(OpenSSL 1.1) |
| 97 | set(OPENSSL_LIBRARIES OpenSSL::SSL OpenSSL::Crypto) | 97 | if (OPENSSL_FOUND) |
| 98 | else() | 98 | set(OPENSSL_LIBRARIES OpenSSL::SSL OpenSSL::Crypto) |
| 99 | endif() | ||
| 100 | endif() | ||
| 101 | |||
| 102 | if (WIN32 OR NOT OPENSSL_FOUND) | ||
| 99 | # LibreSSL | 103 | # LibreSSL |
| 100 | set(LIBRESSL_SKIP_INSTALL ON CACHE BOOL "") | 104 | set(LIBRESSL_SKIP_INSTALL ON CACHE BOOL "") |
| 101 | set(OPENSSLDIR "/etc/ssl/") | 105 | set(OPENSSLDIR "/etc/ssl/") |