diff options
| author | 2023-02-28 11:39:32 -0500 | |
|---|---|---|
| committer | 2023-02-28 11:39:32 -0500 | |
| commit | b44527a25908e54b26ce2a4e9fcdf45f36e64993 (patch) | |
| tree | 266b2fdff13b1b1e0dfb3faf1cb695ad0240194b /CMakeLists.txt | |
| parent | Merge pull request #9844 from abouvier/jwt-fix (diff) | |
| parent | externals: use openssl from vcpkg (diff) | |
| download | yuzu-b44527a25908e54b26ce2a4e9fcdf45f36e64993.tar.gz yuzu-b44527a25908e54b26ce2a4e9fcdf45f36e64993.tar.xz yuzu-b44527a25908e54b26ce2a4e9fcdf45f36e64993.zip | |
Merge pull request #9851 from abouvier/openssl-vcpkg
externals: use openssl from vcpkg
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 906073602..0f344ffd9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
| @@ -67,6 +67,9 @@ if (YUZU_USE_BUNDLED_VCPKG) | |||
| 67 | if (YUZU_CRASH_DUMPS) | 67 | if (YUZU_CRASH_DUMPS) |
| 68 | list(APPEND VCPKG_MANIFEST_FEATURES "dbghelp") | 68 | list(APPEND VCPKG_MANIFEST_FEATURES "dbghelp") |
| 69 | endif() | 69 | endif() |
| 70 | if (ENABLE_WEB_SERVICE) | ||
| 71 | list(APPEND VCPKG_MANIFEST_FEATURES "web-service") | ||
| 72 | endif() | ||
| 70 | 73 | ||
| 71 | include(${CMAKE_SOURCE_DIR}/externals/vcpkg/scripts/buildsystems/vcpkg.cmake) | 74 | include(${CMAKE_SOURCE_DIR}/externals/vcpkg/scripts/buildsystems/vcpkg.cmake) |
| 72 | elseif(NOT "$ENV{VCPKG_TOOLCHAIN_FILE}" STREQUAL "") | 75 | elseif(NOT "$ENV{VCPKG_TOOLCHAIN_FILE}" STREQUAL "") |
| @@ -244,9 +247,6 @@ endif() | |||
| 244 | if (ENABLE_WEB_SERVICE) | 247 | if (ENABLE_WEB_SERVICE) |
| 245 | find_package(cpp-jwt 1.4 CONFIG) | 248 | find_package(cpp-jwt 1.4 CONFIG) |
| 246 | find_package(httplib 0.12 MODULE) | 249 | find_package(httplib 0.12 MODULE) |
| 247 | if (NOT cpp-jwt_FOUND OR NOT httplib_FOUND) | ||
| 248 | find_package(OpenSSL 1.1 MODULE COMPONENTS Crypto SSL) | ||
| 249 | endif() | ||
| 250 | endif() | 250 | endif() |
| 251 | 251 | ||
| 252 | if (YUZU_TESTS) | 252 | if (YUZU_TESTS) |