diff options
Diffstat (limited to '')
| -rw-r--r-- | externals/CMakeLists.txt | 13 | ||||
| -rw-r--r-- | externals/find-modules/FindFFmpeg.cmake | 8 | ||||
| m--------- | externals/sirit | 0 |
3 files changed, 16 insertions, 5 deletions
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index dcd7df764..25ef0c058 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -72,7 +72,6 @@ if (YUZU_USE_EXTERNAL_SDL2) endif() add_subdirectory(SDL EXCLUDE_FROM_ALL) - add_library(SDL2 ALIAS SDL2-static) endif() # ENet @@ -95,10 +94,14 @@ endif() add_subdirectory(sirit) if (ENABLE_WEB_SERVICE) - find_package(OpenSSL 1.1) - if (OPENSSL_FOUND) - set(OPENSSL_LIBRARIES OpenSSL::SSL OpenSSL::Crypto) - else() + 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 CACHE BOOL "") set(OPENSSLDIR "/etc/ssl/") diff --git a/externals/find-modules/FindFFmpeg.cmake b/externals/find-modules/FindFFmpeg.cmake index add5b2c01..eedf28aea 100644 --- a/externals/find-modules/FindFFmpeg.cmake +++ b/externals/find-modules/FindFFmpeg.cmake @@ -185,3 +185,11 @@ foreach(c ${_FFmpeg_ALL_COMPONENTS}) endforeach() unset(_FFmpeg_ALL_COMPONENTS) unset(_FFmpeg_REQUIRED_VARS) + +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(FFmpeg + REQUIRED_VARS + FFmpeg_LIBRARIES + FFmpeg_INCLUDE_DIR + HANDLE_COMPONENTS +) diff --git a/externals/sirit b/externals/sirit -Subproject aa292d56650bc28f2b2d75973fab2e61d0136f9 +Subproject d7ad93a88864bda94e282e95028f90b5784e4d2 |