Browse Source
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).
pull/15/merge
bunnei
6 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with
14 additions and
11 deletions
.gitmodules
CMakeLists.txt
externals/CMakeLists.txt
externals/libressl
@ -13,6 +13,9 @@
[submodule "soundtouch"]
path = externals/soundtouch
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"]
path = externals/discord-rpc
url = https://github.com/discordapp/discord-rpc.git
@ -152,7 +152,6 @@ macro(yuzu_find_packages)
" B o o s t 1 . 7 1 b o o s t / 1 . 7 2 . 0 "
" C a t c h 2 2 . 1 1 c a t c h 2 / 2 . 1 1 . 0 "
" f m t 6 . 2 f m t / 6 . 2 . 0 "
" O p e n S S L 1 . 1 o p e n s s l / 1 . 1 . 1 f "
# c a n ' t u s e u n t i l h t t p s : / / g i t h u b . c o m / b i n c r a f t e r s / c o m m u n i t y / i s s u e s / 1 1 7 3
# " l i b z i p 1 . 5 l i b z i p / 1 . 5 . 2 @ b i n c r a f t e r s / s t a b l e "
" l z 4 1 . 8 l z 4 / 1 . 9 . 2 "
@ -312,15 +311,6 @@ elseif (TARGET Boost::boost)
add_library ( boost ALIAS Boost::boost )
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 )
# i m p o r t e d f r o m t h e c o n a n g e n e r a t e d s d l 2 C o n f i g . c m a k e
set_target_properties ( sdl2::sdl2 PROPERTIES IMPORTED_GLOBAL TRUE )
@ -73,6 +73,15 @@ if (NOT LIBZIP_FOUND)
endif ( )
if ( ENABLE_WEB_SERVICE )
# L i b r e S S L
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
D I R E C T O R Y l i b r e s s l
D E F I N I T I O N O P E N S S L _ L I B S )
# l u r l p a r s e r
add_subdirectory ( lurlparser EXCLUDE_FROM_ALL )
@ -80,5 +89,5 @@ if (ENABLE_WEB_SERVICE)
add_library ( httplib INTERFACE )
target_include_directories ( httplib INTERFACE ./httplib )
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 ( )
@ -0,0 +1 @@
Subproject commit 7d01cb01cb1a926ecb4c9c98b107ef3c26f59dfb