Browse Source
[cmake] ffmpeg: use cpm
Signed-off-by: crueter <crueter@eden-emu.dev>
pull/250/head
crueter
7 months ago
committed by
crueter
No known key found for this signature in database
GPG Key ID: 425ACD2D4830EBC6
3 changed files with
7 additions and
1 deletions
-
CMakeLists.txt
-
CMakeModules/CPMUtil.cmake
-
externals/ffmpeg/CMakeLists.txt
|
|
|
@ -708,6 +708,11 @@ if (NOT YUZU_USE_BUNDLED_FFMPEG) |
|
|
|
# Use system installed FFmpeg |
|
|
|
#find_package(FFmpeg 4.3 REQUIRED QUIET COMPONENTS ${FFmpeg_COMPONENTS}) |
|
|
|
find_package(FFmpeg REQUIRED QUIET COMPONENTS ${FFmpeg_COMPONENTS}) |
|
|
|
|
|
|
|
# TODO(crueter): Version |
|
|
|
set_property(GLOBAL APPEND PROPERTY CPM_PACKAGE_NAMES FFmpeg) |
|
|
|
set_property(GLOBAL APPEND PROPERTY CPM_PACKAGE_SHAS "unknown (system)") |
|
|
|
set_property(GLOBAL APPEND PROPERTY CPM_PACKAGE_URLS "https://github.com/FFmpeg/FFmpeg") |
|
|
|
endif() |
|
|
|
|
|
|
|
if(ENABLE_QT) |
|
|
|
|
|
|
|
@ -108,7 +108,7 @@ function(AddPackage) |
|
|
|
set_property(GLOBAL APPEND PROPERTY CPM_PACKAGE_SHAS "unknown") |
|
|
|
endif() |
|
|
|
else() |
|
|
|
if (DEFINED CPM_PACKAGE_${PKG_ARGS_NAME}_VERSION) |
|
|
|
if (DEFINED CPM_PACKAGE_${PKG_ARGS_NAME}_VERSION AND NOT "${CPM_PACKAGE_${PKG_ARGS_NAME}_VERSION}" STREQUAL "") |
|
|
|
set_property(GLOBAL APPEND PROPERTY CPM_PACKAGE_SHAS "${CPM_PACKAGE_${PKG_ARGS_NAME}_VERSION} (system)") |
|
|
|
else() |
|
|
|
set_property(GLOBAL APPEND PROPERTY CPM_PACKAGE_SHAS "unknown (system)") |
|
|
|
|
|
|
|
@ -24,6 +24,7 @@ if (NOT WIN32 AND NOT ANDROID) |
|
|
|
REPO "FFmpeg/FFmpeg" |
|
|
|
SHA c2184b65d2 |
|
|
|
HASH 2a89d664119debbb3c006ab1c48d5d7f26e889f4a65ad2e25c8b0503308295123d5a9c5c78bf683aef5ff09acef8c3fc2837f22d3e8c611528b933bf03bcdd97 |
|
|
|
SYSTEM_PACKAGE OFF |
|
|
|
) |
|
|
|
|
|
|
|
set(FFmpeg_PREFIX ${ffmpeg_SOURCE_DIR}) |
|
|
|
|
