cmake: Don't build nv-codec headers unless ENABLE_NVDEC is set.

Fixes #1021.
MythTV · Jan 30, 2025 · ae1c92d · ae1c92d
1 parent d6faefe
commit ae1c92d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/cmake/embeddedlibs/FindOrBuildNvCodecHeaders.cmake b/cmake/embeddedlibs/FindOrBuildNvCodecHeaders.cmake
@@ -9,8 +9,9 @@
 # the FFmpeg configure script will disable nvdec, nvec, and ffnvcodec, so
 # there's no point in setting up the headers.
 #
-if(NOT CMAKE_SYSTEM_NAME MATCHES "Linux|Windows" OR NOT CMAKE_SYSTEM_PROCESSOR
-                                                    MATCHES "x86|aarch64")
+if(NOT ENABLE_NVDEC
+   OR NOT CMAKE_SYSTEM_NAME MATCHES "Linux|Windows"
+   OR NOT CMAKE_SYSTEM_PROCESSOR MATCHES "x86|aarch64")
   list(APPEND FF_ARGS --disable-nvdec --disable-nvenc --disable-ffnvcodec)
   return()
 endif()

diff --git a/mythtv/cmake/MythFindPackages.cmake b/mythtv/cmake/MythFindPackages.cmake
@@ -25,6 +25,7 @@ find_package(PkgConfig REQUIRED)
 # have already been compiled and installed by the super-package.
 #
 if(NOT CMAKE_CROSSCOMPILING
+   AND ENABLE_NVDEC
    AND CMAKE_SYSTEM_NAME MATCHES "Linux|Windows"
    AND CMAKE_SYSTEM_PROCESSOR MATCHES "x86|aarch64")
   pkg_check_modules(FFNVCODEC ffnvcodec REQUIRED IMPORTED_TARGET)