aboutsummaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorLukas Rusak <lorusak@gmail.com>2020-04-15 09:00:25 -0700
committerLukas Rusak <lorusak@gmail.com>2020-04-16 16:21:54 -0700
commitadbd81bc101b689c8cb71b88262da26bf7bbee18 (patch)
tree17d332073accc95f165fc4fb6dd90e2416df4a04 /cmake
parent23551b162513daecc6d0b5a372c80d2750601d52 (diff)
[cmake] dav1d: make optional for internal build
Diffstat (limited to 'cmake')
-rw-r--r--cmake/modules/FindDav1d.cmake5
-rw-r--r--cmake/modules/FindFFMPEG.cmake4
2 files changed, 3 insertions, 6 deletions
diff --git a/cmake/modules/FindDav1d.cmake b/cmake/modules/FindDav1d.cmake
index a2b8023f44..7625afa1d2 100644
--- a/cmake/modules/FindDav1d.cmake
+++ b/cmake/modules/FindDav1d.cmake
@@ -21,11 +21,6 @@ find_path(DAV1D_INCLUDE_DIR NAMES dav1d/dav1d.h
set(DAV1D_VERSION ${PC_DAV1D_VERSION})
-if (NOT DAV1D_LIBRARY AND NOT DAV1D_INCLUDE_DIR AND NOT DAV1D_VERSION)
- set(ENABLE_INTERNAL_DAV1D ON)
- message(STATUS "libdav1d not found, falling back to internal build")
-endif()
-
if(ENABLE_INTERNAL_DAV1D)
include(ExternalProject)
diff --git a/cmake/modules/FindFFMPEG.cmake b/cmake/modules/FindFFMPEG.cmake
index 59c6600d95..387b3f926f 100644
--- a/cmake/modules/FindFFMPEG.cmake
+++ b/cmake/modules/FindFFMPEG.cmake
@@ -229,7 +229,9 @@ if(NOT FFMPEG_FOUND)
message(STATUS "FFMPEG_URL: ${FFMPEG_URL}")
endif()
- find_package(Dav1d)
+ if (NOT DAV1D_FOUND)
+ message(STATUS "dav1d not found, internal ffmpeg build will be missing AV1 support!")
+ endif()
set(FFMPEG_OPTIONS -DENABLE_CCACHE=${ENABLE_CCACHE}
-DCCACHE_PROGRAM=${CCACHE_PROGRAM}