diff options
| author | liamwhite <liamwhite@users.noreply.github.com> | 2022-12-01 15:57:40 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-01 15:57:40 +0100 |
| commit | dcc663e1bf72bb7dbe4f40abe8dd5a5f6dcd88a9 (patch) | |
| tree | c09324150d88320a655361dc63f6dda445636d2a | |
| parent | Merge pull request #9366 from zhaobot/tx-update-20221201025957 (diff) | |
| parent | ci/clang: Enable bundled FFmpeg (diff) | |
| download | yuzu-dcc663e1bf72bb7dbe4f40abe8dd5a5f6dcd88a9.tar yuzu-dcc663e1bf72bb7dbe4f40abe8dd5a5f6dcd88a9.tar.gz yuzu-dcc663e1bf72bb7dbe4f40abe8dd5a5f6dcd88a9.tar.bz2 yuzu-dcc663e1bf72bb7dbe4f40abe8dd5a5f6dcd88a9.tar.lz yuzu-dcc663e1bf72bb7dbe4f40abe8dd5a5f6dcd88a9.tar.xz yuzu-dcc663e1bf72bb7dbe4f40abe8dd5a5f6dcd88a9.tar.zst yuzu-dcc663e1bf72bb7dbe4f40abe8dd5a5f6dcd88a9.zip | |
| -rwxr-xr-x | .ci/scripts/clang/docker.sh | 1 | ||||
| -rw-r--r-- | CMakeLists.txt | 17 | ||||
| -rw-r--r-- | externals/find-modules/FindFFmpeg.cmake | 8 |
3 files changed, 10 insertions, 16 deletions
diff --git a/.ci/scripts/clang/docker.sh b/.ci/scripts/clang/docker.sh index 792ef4aa8..7d3ae4a1a 100755 --- a/.ci/scripts/clang/docker.sh +++ b/.ci/scripts/clang/docker.sh @@ -19,6 +19,7 @@ cmake .. \ -DENABLE_QT_TRANSLATION=ON \ -DUSE_DISCORD_PRESENCE=ON \ -DYUZU_ENABLE_COMPATIBILITY_REPORTING=${ENABLE_COMPATIBILITY_REPORTING:-"OFF"} \ + -DYUZU_USE_BUNDLED_FFMPEG=ON \ -GNinja ninja diff --git a/CMakeLists.txt b/CMakeLists.txt index 05bffe68e..b2fbe8806 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -458,22 +458,7 @@ if (UNIX AND NOT APPLE) endif() if (NOT YUZU_USE_BUNDLED_FFMPEG) # Use system installed FFmpeg - find_package(FFmpeg 4.3 QUIET COMPONENTS ${FFmpeg_COMPONENTS}) - - if (FFmpeg_FOUND) - # Overwrite aggregate defines from FFmpeg module to avoid over-linking libraries. - # Prevents shipping too many libraries with the AppImage. - set(FFmpeg_LIBRARIES "") - set(FFmpeg_INCLUDE_DIR "") - - foreach(COMPONENT ${FFmpeg_COMPONENTS}) - set(FFmpeg_LIBRARIES ${FFmpeg_LIBRARIES} ${FFmpeg_LIBRARY_${COMPONENT}} CACHE PATH "Paths to FFmpeg libraries" FORCE) - set(FFmpeg_INCLUDE_DIR ${FFmpeg_INCLUDE_DIR} ${FFmpeg_INCLUDE_${COMPONENT}} CACHE PATH "Path to FFmpeg headers" FORCE) - endforeach() - else() - message(WARNING "FFmpeg not found or too old, falling back to externals") - set(YUZU_USE_BUNDLED_FFMPEG ON) - endif() + find_package(FFmpeg 4.3 REQUIRED QUIET COMPONENTS ${FFmpeg_COMPONENTS}) endif() # Prefer the -pthread flag on Linux. 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 +) |