summaryrefslogtreecommitdiff
path: root/externals
diff options
context:
space:
mode:
authorGravatar bunnei2020-06-16 21:46:19 -0400
committerGravatar GitHub2020-06-16 21:46:19 -0400
commit2a3d4cad63f80151893ee49ee205c5f72aefd321 (patch)
treef18ce34026676736f0c2fff89da97f952378513d /externals
parentMerge pull request #4041 from ReinUsesLisp/arb-decomp (diff)
downloadyuzu-2a3d4cad63f80151893ee49ee205c5f72aefd321.tar.gz
yuzu-2a3d4cad63f80151893ee49ee205c5f72aefd321.tar.xz
yuzu-2a3d4cad63f80151893ee49ee205c5f72aefd321.zip
externals: Revert to libressl, as build is broken with find_package(OpenSSL). (#4093)
* externals: Revert to libressl, as build is broken with find_package(OpenSLL). * fixup! externals: Revert to libressl, as build is broken with find_package(OpenSLL). * fixup! externals: Revert to libressl, as build is broken with find_package(OpenSLL).
Diffstat (limited to 'externals')
-rw-r--r--externals/CMakeLists.txt11
m---------externals/libressl0
2 files changed, 10 insertions, 1 deletions
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index 9be5b2780..b80b27605 100644
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@@ -73,6 +73,15 @@ if (NOT LIBZIP_FOUND)
73endif() 73endif()
74 74
75if (ENABLE_WEB_SERVICE) 75if (ENABLE_WEB_SERVICE)
76 # LibreSSL
77 set(LIBRESSL_SKIP_INSTALL ON CACHE BOOL "")
78 add_subdirectory(libressl EXCLUDE_FROM_ALL)
79 target_include_directories(ssl INTERFACE ./libressl/include)
80 target_compile_definitions(ssl PRIVATE -DHAVE_INET_NTOP)
81 get_directory_property(OPENSSL_LIBRARIES
82 DIRECTORY libressl
83 DEFINITION OPENSSL_LIBS)
84
76 # lurlparser 85 # lurlparser
77 add_subdirectory(lurlparser EXCLUDE_FROM_ALL) 86 add_subdirectory(lurlparser EXCLUDE_FROM_ALL)
78 87
@@ -80,5 +89,5 @@ if (ENABLE_WEB_SERVICE)
80 add_library(httplib INTERFACE) 89 add_library(httplib INTERFACE)
81 target_include_directories(httplib INTERFACE ./httplib) 90 target_include_directories(httplib INTERFACE ./httplib)
82 target_compile_definitions(httplib INTERFACE -DCPPHTTPLIB_OPENSSL_SUPPORT) 91 target_compile_definitions(httplib INTERFACE -DCPPHTTPLIB_OPENSSL_SUPPORT)
83 target_link_libraries(httplib INTERFACE OpenSSL::SSL OpenSSL::Crypto) 92 target_link_libraries(httplib INTERFACE ${OPENSSL_LIBRARIES})
84endif() 93endif()
diff --git a/externals/libressl b/externals/libressl
new file mode 160000
Subproject 7d01cb01cb1a926ecb4c9c98b107ef3c26f59df