diff options
| author | 2020-06-16 21:46:19 -0400 | |
|---|---|---|
| committer | 2020-06-16 21:46:19 -0400 | |
| commit | 2a3d4cad63f80151893ee49ee205c5f72aefd321 (patch) | |
| tree | f18ce34026676736f0c2fff89da97f952378513d | |
| parent | Merge pull request #4041 from ReinUsesLisp/arb-decomp (diff) | |
| download | yuzu-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).
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | CMakeLists.txt | 10 | ||||
| -rw-r--r-- | externals/CMakeLists.txt | 11 | ||||
| m--------- | externals/libressl | 0 |
4 files changed, 13 insertions, 11 deletions
diff --git a/.gitmodules b/.gitmodules index 2ec9dda62..9ba8fe207 100644 --- a/.gitmodules +++ b/.gitmodules | |||
| @@ -13,6 +13,9 @@ | |||
| 13 | [submodule "soundtouch"] | 13 | [submodule "soundtouch"] |
| 14 | path = externals/soundtouch | 14 | path = externals/soundtouch |
| 15 | url = https://github.com/citra-emu/ext-soundtouch.git | 15 | url = https://github.com/citra-emu/ext-soundtouch.git |
| 16 | [submodule "libressl"] | ||
| 17 | path = externals/libressl | ||
| 18 | url = https://github.com/citra-emu/ext-libressl-portable.git | ||
| 16 | [submodule "discord-rpc"] | 19 | [submodule "discord-rpc"] |
| 17 | path = externals/discord-rpc | 20 | path = externals/discord-rpc |
| 18 | url = https://github.com/discordapp/discord-rpc.git | 21 | url = https://github.com/discordapp/discord-rpc.git |
diff --git a/CMakeLists.txt b/CMakeLists.txt index a9f669d56..b71071271 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
| @@ -152,7 +152,6 @@ macro(yuzu_find_packages) | |||
| 152 | "Boost 1.71 boost/1.72.0" | 152 | "Boost 1.71 boost/1.72.0" |
| 153 | "Catch2 2.11 catch2/2.11.0" | 153 | "Catch2 2.11 catch2/2.11.0" |
| 154 | "fmt 6.2 fmt/6.2.0" | 154 | "fmt 6.2 fmt/6.2.0" |
| 155 | "OpenSSL 1.1 openssl/1.1.1f" | ||
| 156 | # can't use until https://github.com/bincrafters/community/issues/1173 | 155 | # can't use until https://github.com/bincrafters/community/issues/1173 |
| 157 | #"libzip 1.5 libzip/1.5.2@bincrafters/stable" | 156 | #"libzip 1.5 libzip/1.5.2@bincrafters/stable" |
| 158 | "lz4 1.8 lz4/1.9.2" | 157 | "lz4 1.8 lz4/1.9.2" |
| @@ -312,15 +311,6 @@ elseif (TARGET Boost::boost) | |||
| 312 | add_library(boost ALIAS Boost::boost) | 311 | add_library(boost ALIAS Boost::boost) |
| 313 | endif() | 312 | endif() |
| 314 | 313 | ||
| 315 | if (NOT TARGET OpenSSL::SSL) | ||
| 316 | set_target_properties(OpenSSL::OpenSSL PROPERTIES IMPORTED_GLOBAL TRUE) | ||
| 317 | add_library(OpenSSL::SSL ALIAS OpenSSL::OpenSSL) | ||
| 318 | endif() | ||
| 319 | if (NOT TARGET OpenSSL::Crypto) | ||
| 320 | set_target_properties(OpenSSL::OpenSSL PROPERTIES IMPORTED_GLOBAL TRUE) | ||
| 321 | add_library(OpenSSL::Crypto ALIAS OpenSSL::OpenSSL) | ||
| 322 | endif() | ||
| 323 | |||
| 324 | if (TARGET sdl2::sdl2) | 314 | if (TARGET sdl2::sdl2) |
| 325 | # imported from the conan generated sdl2Config.cmake | 315 | # imported from the conan generated sdl2Config.cmake |
| 326 | set_target_properties(sdl2::sdl2 PROPERTIES IMPORTED_GLOBAL TRUE) | 316 | set_target_properties(sdl2::sdl2 PROPERTIES IMPORTED_GLOBAL TRUE) |
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) | |||
| 73 | endif() | 73 | endif() |
| 74 | 74 | ||
| 75 | if (ENABLE_WEB_SERVICE) | 75 | if (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}) |
| 84 | endif() | 93 | endif() |
diff --git a/externals/libressl b/externals/libressl new file mode 160000 | |||
| Subproject 7d01cb01cb1a926ecb4c9c98b107ef3c26f59df | |||