diff options
Diffstat (limited to 'externals')
| -rw-r--r-- | externals/CMakeLists.txt | 37 | ||||
| m--------- | externals/libressl | 0 |
2 files changed, 6 insertions, 31 deletions
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index 8532fd7a8..f2a560f04 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -102,41 +102,16 @@ add_subdirectory(sirit EXCLUDE_FROM_ALL) # httplib if (ENABLE_WEB_SERVICE AND NOT TARGET httplib::httplib) - if (NOT WIN32) - find_package(OpenSSL 1.1) - if (OPENSSL_FOUND) - set(OPENSSL_LIBRARIES OpenSSL::SSL OpenSSL::Crypto) - endif() - endif() - - if (WIN32 OR NOT OPENSSL_FOUND) - # LibreSSL - 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) - endif() - - 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) - 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 |