diff options
| author | 2021-02-05 15:39:19 -0500 | |
|---|---|---|
| committer | 2021-02-05 15:39:19 -0500 | |
| commit | 1d19eac415199bd4c768f1cbebc9f23298734545 (patch) | |
| tree | 44fde361562f37ab713e4332d883a73b819f4c26 /src | |
| parent | ci/windows: Copy downloaded FFmpeg libraries (diff) | |
| download | yuzu-1d19eac415199bd4c768f1cbebc9f23298734545.tar.gz yuzu-1d19eac415199bd4c768f1cbebc9f23298734545.tar.xz yuzu-1d19eac415199bd4c768f1cbebc9f23298734545.zip | |
CMake: Port citra-emu/citra FindFFmpeg.cmake
Also renames related CMake variables to match both the Find*FFmpeg* and
variables defined within the file. Fixes odd errors produced by the old
FindFFmpeg.
Citra's FindFFmpeg is slightly modified here: adds Citra's copyright at
the beginning, renames FFmpeg_INCLUDES to FFmpeg_INCLUDE_DIR, disables a
few components in _FFmpeg_ALL_COMPONENTS, and adds the missing avutil
component to the comment above.
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_core/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/video_core/CMakeLists.txt b/src/video_core/CMakeLists.txt index 01e284d8c..1434d0260 100644 --- a/src/video_core/CMakeLists.txt +++ b/src/video_core/CMakeLists.txt | |||
| @@ -277,8 +277,8 @@ if (YUZU_USE_BUNDLED_FFMPEG AND NOT WIN32) | |||
| 277 | add_dependencies(video_core ffmpeg-build) | 277 | add_dependencies(video_core ffmpeg-build) |
| 278 | endif() | 278 | endif() |
| 279 | 279 | ||
| 280 | target_include_directories(video_core PRIVATE ${FFMPEG_INCLUDE_DIR}) | 280 | target_include_directories(video_core PRIVATE ${FFmpeg_INCLUDE_DIR}) |
| 281 | target_link_libraries(video_core PRIVATE ${FFMPEG_LIBRARIES}) | 281 | target_link_libraries(video_core PRIVATE ${FFmpeg_LIBRARIES}) |
| 282 | 282 | ||
| 283 | add_dependencies(video_core host_shaders) | 283 | add_dependencies(video_core host_shaders) |
| 284 | target_include_directories(video_core PRIVATE ${HOST_SHADERS_INCLUDE}) | 284 | target_include_directories(video_core PRIVATE ${HOST_SHADERS_INCLUDE}) |