diff options
| author | Alexandre Bouvier <contact@amb.tf> | 2023-02-22 20:27:05 +0100 |
|---|---|---|
| committer | Alexandre Bouvier <contact@amb.tf> | 2023-02-28 06:39:54 +0100 |
| commit | 0245c5dc4953b11397bd80a7bf658a736f1340e1 (patch) | |
| tree | 266b2fdff13b1b1e0dfb3faf1cb695ad0240194b /externals | |
| parent | Merge pull request #9844 from abouvier/jwt-fix (diff) | |
| download | yuzu-0245c5dc4953b11397bd80a7bf658a736f1340e1.tar yuzu-0245c5dc4953b11397bd80a7bf658a736f1340e1.tar.gz yuzu-0245c5dc4953b11397bd80a7bf658a736f1340e1.tar.bz2 yuzu-0245c5dc4953b11397bd80a7bf658a736f1340e1.tar.lz yuzu-0245c5dc4953b11397bd80a7bf658a736f1340e1.tar.xz yuzu-0245c5dc4953b11397bd80a7bf658a736f1340e1.tar.zst yuzu-0245c5dc4953b11397bd80a7bf658a736f1340e1.zip | |
Diffstat (limited to 'externals')
| -rw-r--r-- | externals/CMakeLists.txt | 35 | ||||
| m--------- | externals/libressl | 0 |
2 files changed, 6 insertions, 29 deletions
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index 966f5e94c..f2a560f04 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -100,41 +100,18 @@ endif() # Sirit add_subdirectory(sirit EXCLUDE_FROM_ALL) -# LibreSSL -if (ENABLE_WEB_SERVICE AND DEFINED OPENSSL_FOUND) - if (WIN32 OR NOT OPENSSL_FOUND) - set(LIBRESSL_SKIP_INSTALL ON) - set(OPENSSLDIR "/etc/ssl/") - add_subdirectory(libressl EXCLUDE_FROM_ALL) - target_include_directories(ssl INTERFACE ./libressl/include) - target_compile_definitions(ssl PRIVATE -DHAVE_INET_NTOP) - get_directory_property(OPENSSL_LIBRARIES - DIRECTORY libressl - DEFINITION OPENSSL_LIBS) - else() - set(OPENSSL_LIBRARIES OpenSSL::SSL OpenSSL::Crypto) - endif() -endif() - # httplib if (ENABLE_WEB_SERVICE AND NOT TARGET httplib::httplib) - add_library(httplib INTERFACE) - target_include_directories(httplib INTERFACE ./cpp-httplib) - target_compile_definitions(httplib INTERFACE -DCPPHTTPLIB_OPENSSL_SUPPORT) - target_link_libraries(httplib INTERFACE ${OPENSSL_LIBRARIES}) - if (WIN32) - target_link_libraries(httplib INTERFACE crypt32 cryptui ws2_32) - endif() - add_library(httplib::httplib ALIAS httplib) + set(HTTPLIB_REQUIRE_OPENSSL ON) + add_subdirectory(cpp-httplib EXCLUDE_FROM_ALL) endif() # cpp-jwt if (ENABLE_WEB_SERVICE AND NOT TARGET cpp-jwt::cpp-jwt) - add_library(cpp-jwt INTERFACE) - target_include_directories(cpp-jwt INTERFACE ./cpp-jwt/include) - target_compile_definitions(cpp-jwt INTERFACE CPP_JWT_USE_VENDORED_NLOHMANN_JSON) - target_link_libraries(cpp-jwt INTERFACE ${OPENSSL_LIBRARIES}) - add_library(cpp-jwt::cpp-jwt ALIAS cpp-jwt) + set(CPP_JWT_BUILD_EXAMPLES OFF) + set(CPP_JWT_BUILD_TESTS OFF) + set(CPP_JWT_USE_VENDORED_NLOHMANN_JSON OFF) + add_subdirectory(cpp-jwt EXCLUDE_FROM_ALL) endif() # Opus diff --git a/externals/libressl b/externals/libressl deleted file mode 160000 -Subproject 8929f818fd748fd31a34fec7c04558399e13014 |