diff options
author | fuzzard <fuzzard@kodi.tv> | 2023-08-12 18:24:39 +1000 |
---|---|---|
committer | fuzzard <fuzzard@kodi.tv> | 2023-09-01 14:17:00 +1000 |
commit | 2490894838a5114440e813e0bf6ebfe93638d87e (patch) | |
tree | ec49ccffe6f9eec4b677afad44a6764977b09fc2 | |
parent | 8be2792144d6c84570611600cc892153846c3e79 (diff) | |
download | xbmc-2490894838a5114440e813e0bf6ebfe93638d87e.tar.xz |
[cmake] FindFFMPEG ENABLE_INTERNAL_FFMPEG dav1d dep fixups
-rw-r--r-- | cmake/modules/FindFFMPEG.cmake | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/cmake/modules/FindFFMPEG.cmake b/cmake/modules/FindFFMPEG.cmake index 755b4d5b26..5f0cfbca11 100644 --- a/cmake/modules/FindFFMPEG.cmake +++ b/cmake/modules/FindFFMPEG.cmake @@ -37,14 +37,17 @@ macro(buildFFMPEG) include(cmake/scripts/common/ModuleHelpers.cmake) - set(MODULE_LC ffmpeg) - - SETUP_BUILD_VARS() - + # Check for dependencies - Must be done before SETUP_BUILD_VARS + get_libversion_data("dav1d" "target") + find_package(Dav1d ${LIB_DAV1D_VER} MODULE) if(NOT DAV1D_FOUND) message(STATUS "dav1d not found, internal ffmpeg build will be missing AV1 support!") endif() + set(MODULE_LC ffmpeg) + + SETUP_BUILD_VARS() + set(FFMPEG_OPTIONS -DENABLE_CCACHE=${ENABLE_CCACHE} -DCCACHE_PROGRAM=${CCACHE_PROGRAM} -DENABLE_VAAPI=${ENABLE_VAAPI} @@ -92,7 +95,7 @@ macro(buildFFMPEG) BUILD_DEP_TARGET() - if(ENABLE_INTERNAL_DAV1D) + if(TARGET dav1d) add_dependencies(ffmpeg dav1d) endif() |