diff options
| author | 2022-12-01 00:49:58 -0500 | |
|---|---|---|
| committer | 2022-12-01 00:49:58 -0500 | |
| commit | 5ff19890e9d2a07d1c0246f3807cdefcb36aca7d (patch) | |
| tree | a2b9a1a13deb277c2847e069dd6e56d81b747df2 /CMakeLists.txt | |
| parent | Merge pull request #9366 from zhaobot/tx-update-20221201025957 (diff) | |
| download | yuzu-5ff19890e9d2a07d1c0246f3807cdefcb36aca7d.tar.gz yuzu-5ff19890e9d2a07d1c0246f3807cdefcb36aca7d.tar.xz yuzu-5ff19890e9d2a07d1c0246f3807cdefcb36aca7d.zip | |
CMake: Fix FFmpeg find module
Uses find_package_handle_standard_args to handle the find_package call
from the root CMakeLists. Removes all the unnecessary logic after the
find_package and just sets it to REQUIRED.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 17 |
1 files changed, 1 insertions, 16 deletions
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) | |||
| 458 | endif() | 458 | endif() |
| 459 | if (NOT YUZU_USE_BUNDLED_FFMPEG) | 459 | if (NOT YUZU_USE_BUNDLED_FFMPEG) |
| 460 | # Use system installed FFmpeg | 460 | # Use system installed FFmpeg |
| 461 | find_package(FFmpeg 4.3 QUIET COMPONENTS ${FFmpeg_COMPONENTS}) | 461 | find_package(FFmpeg 4.3 REQUIRED QUIET COMPONENTS ${FFmpeg_COMPONENTS}) |
| 462 | |||
| 463 | if (FFmpeg_FOUND) | ||
| 464 | # Overwrite aggregate defines from FFmpeg module to avoid over-linking libraries. | ||
| 465 | # Prevents shipping too many libraries with the AppImage. | ||
| 466 | set(FFmpeg_LIBRARIES "") | ||
| 467 | set(FFmpeg_INCLUDE_DIR "") | ||
| 468 | |||
| 469 | foreach(COMPONENT ${FFmpeg_COMPONENTS}) | ||
| 470 | set(FFmpeg_LIBRARIES ${FFmpeg_LIBRARIES} ${FFmpeg_LIBRARY_${COMPONENT}} CACHE PATH "Paths to FFmpeg libraries" FORCE) | ||
| 471 | set(FFmpeg_INCLUDE_DIR ${FFmpeg_INCLUDE_DIR} ${FFmpeg_INCLUDE_${COMPONENT}} CACHE PATH "Path to FFmpeg headers" FORCE) | ||
| 472 | endforeach() | ||
| 473 | else() | ||
| 474 | message(WARNING "FFmpeg not found or too old, falling back to externals") | ||
| 475 | set(YUZU_USE_BUNDLED_FFMPEG ON) | ||
| 476 | endif() | ||
| 477 | endif() | 462 | endif() |
| 478 | 463 | ||
| 479 | # Prefer the -pthread flag on Linux. | 464 | # Prefer the -pthread flag on Linux. |