diff options
| author | liamwhite <liamwhite@users.noreply.github.com> | 2023-02-28 11:39:32 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-28 11:39:32 -0500 |
| commit | b44527a25908e54b26ce2a4e9fcdf45f36e64993 (patch) | |
| tree | 266b2fdff13b1b1e0dfb3faf1cb695ad0240194b /CMakeLists.txt | |
| parent | a78a475815ee20d448fb75db7707d52e974041a2 (diff) | |
| parent | 0245c5dc4953b11397bd80a7bf658a736f1340e1 (diff) | |
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) if (YUZU_CRASH_DUMPS) list(APPEND VCPKG_MANIFEST_FEATURES "dbghelp") endif() + if (ENABLE_WEB_SERVICE) + list(APPEND VCPKG_MANIFEST_FEATURES "web-service") + endif() include(${CMAKE_SOURCE_DIR}/externals/vcpkg/scripts/buildsystems/vcpkg.cmake) elseif(NOT "$ENV{VCPKG_TOOLCHAIN_FILE}" STREQUAL "") @@ -244,9 +247,6 @@ endif() if (ENABLE_WEB_SERVICE) find_package(cpp-jwt 1.4 CONFIG) find_package(httplib 0.12 MODULE) - if (NOT cpp-jwt_FOUND OR NOT httplib_FOUND) - find_package(OpenSSL 1.1 MODULE COMPONENTS Crypto SSL) - endif() endif() if (YUZU_TESTS) |