diff options
Diffstat (limited to 'externals')
| -rw-r--r-- | externals/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | externals/find-modules/FindFFmpeg.cmake | 8 | ||||
| m--------- | externals/sirit | 0 |
3 files changed, 11 insertions, 1 deletions
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index d807ef65f..25ef0c058 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -67,9 +67,11 @@ if (YUZU_USE_EXTERNAL_SDL2) endif() set(SDL_STATIC ON) set(SDL_SHARED OFF) + if (APPLE) + set(SDL_FILE ON) + endif() add_subdirectory(SDL EXCLUDE_FROM_ALL) - add_library(SDL2 ALIAS SDL2-static) endif() # ENet 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 |