forked from suyu/suyu
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).
This commit is contained in:
parent
798ec003ce
commit
2a3d4cad63
4 changed files with 14 additions and 11 deletions
3
.gitmodules
vendored
3
.gitmodules
vendored
|
@ -13,6 +13,9 @@
|
||||||
[submodule "soundtouch"]
|
[submodule "soundtouch"]
|
||||||
path = externals/soundtouch
|
path = externals/soundtouch
|
||||||
url = https://github.com/citra-emu/ext-soundtouch.git
|
url = https://github.com/citra-emu/ext-soundtouch.git
|
||||||
|
[submodule "libressl"]
|
||||||
|
path = externals/libressl
|
||||||
|
url = https://github.com/citra-emu/ext-libressl-portable.git
|
||||||
[submodule "discord-rpc"]
|
[submodule "discord-rpc"]
|
||||||
path = externals/discord-rpc
|
path = externals/discord-rpc
|
||||||
url = https://github.com/discordapp/discord-rpc.git
|
url = https://github.com/discordapp/discord-rpc.git
|
||||||
|
|
|
@ -152,7 +152,6 @@ macro(yuzu_find_packages)
|
||||||
"Boost 1.71 boost/1.72.0"
|
"Boost 1.71 boost/1.72.0"
|
||||||
"Catch2 2.11 catch2/2.11.0"
|
"Catch2 2.11 catch2/2.11.0"
|
||||||
"fmt 6.2 fmt/6.2.0"
|
"fmt 6.2 fmt/6.2.0"
|
||||||
"OpenSSL 1.1 openssl/1.1.1f"
|
|
||||||
# can't use until https://github.com/bincrafters/community/issues/1173
|
# can't use until https://github.com/bincrafters/community/issues/1173
|
||||||
#"libzip 1.5 libzip/1.5.2@bincrafters/stable"
|
#"libzip 1.5 libzip/1.5.2@bincrafters/stable"
|
||||||
"lz4 1.8 lz4/1.9.2"
|
"lz4 1.8 lz4/1.9.2"
|
||||||
|
@ -312,15 +311,6 @@ elseif (TARGET Boost::boost)
|
||||||
add_library(boost ALIAS Boost::boost)
|
add_library(boost ALIAS Boost::boost)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (NOT TARGET OpenSSL::SSL)
|
|
||||||
set_target_properties(OpenSSL::OpenSSL PROPERTIES IMPORTED_GLOBAL TRUE)
|
|
||||||
add_library(OpenSSL::SSL ALIAS OpenSSL::OpenSSL)
|
|
||||||
endif()
|
|
||||||
if (NOT TARGET OpenSSL::Crypto)
|
|
||||||
set_target_properties(OpenSSL::OpenSSL PROPERTIES IMPORTED_GLOBAL TRUE)
|
|
||||||
add_library(OpenSSL::Crypto ALIAS OpenSSL::OpenSSL)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if (TARGET sdl2::sdl2)
|
if (TARGET sdl2::sdl2)
|
||||||
# imported from the conan generated sdl2Config.cmake
|
# imported from the conan generated sdl2Config.cmake
|
||||||
set_target_properties(sdl2::sdl2 PROPERTIES IMPORTED_GLOBAL TRUE)
|
set_target_properties(sdl2::sdl2 PROPERTIES IMPORTED_GLOBAL TRUE)
|
||||||
|
|
11
externals/CMakeLists.txt
vendored
11
externals/CMakeLists.txt
vendored
|
@ -73,6 +73,15 @@ if (NOT LIBZIP_FOUND)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (ENABLE_WEB_SERVICE)
|
if (ENABLE_WEB_SERVICE)
|
||||||
|
# LibreSSL
|
||||||
|
set(LIBRESSL_SKIP_INSTALL ON CACHE BOOL "")
|
||||||
|
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)
|
||||||
|
|
||||||
# lurlparser
|
# lurlparser
|
||||||
add_subdirectory(lurlparser EXCLUDE_FROM_ALL)
|
add_subdirectory(lurlparser EXCLUDE_FROM_ALL)
|
||||||
|
|
||||||
|
@ -80,5 +89,5 @@ if (ENABLE_WEB_SERVICE)
|
||||||
add_library(httplib INTERFACE)
|
add_library(httplib INTERFACE)
|
||||||
target_include_directories(httplib INTERFACE ./httplib)
|
target_include_directories(httplib INTERFACE ./httplib)
|
||||||
target_compile_definitions(httplib INTERFACE -DCPPHTTPLIB_OPENSSL_SUPPORT)
|
target_compile_definitions(httplib INTERFACE -DCPPHTTPLIB_OPENSSL_SUPPORT)
|
||||||
target_link_libraries(httplib INTERFACE OpenSSL::SSL OpenSSL::Crypto)
|
target_link_libraries(httplib INTERFACE ${OPENSSL_LIBRARIES})
|
||||||
endif()
|
endif()
|
||||||
|
|
1
externals/libressl
vendored
Submodule
1
externals/libressl
vendored
Submodule
|
@ -0,0 +1 @@
|
||||||
|
Subproject commit 7d01cb01cb1a926ecb4c9c98b107ef3c26f59dfb
|
Loading…
Reference in a new issue