From 6a0ad8c27cf8f41a368475c4f7d4ba9602542dc6 Mon Sep 17 00:00:00 2001 From: wsnipex Date: Thu, 7 Jun 2018 10:17:15 +0200 Subject: [cmake] pass vaapi and vdpau options to internal ffmpeg --- CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index bc9b96240d..5227b77d58 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -171,9 +171,10 @@ set(dyload_optional Bluray find_package(TexturePacker REQUIRED) find_package(JsonSchemaBuilder REQUIRED) -core_require_dep(${required_deps}) +# Check optional deps first, since their availability can influence required ones, e.g. ffmpeg core_optional_dep(${optional_deps}) core_optional_dyload_dep(${dyload_optional}) +core_require_dep(${required_deps}) if(ENABLE_MARIADBCLIENT AND NOT ENABLE_MARIADBCLIENT STREQUAL AUTO AND ENABLE_MYSQLCLIENT AND NOT ENABLE_MYSQLCLIENT STREQUAL AUTO) MESSAGE(FATAL_ERROR "You can not use MySql and MariaDB at the same time. Disable one by adding -DENABLE_MYSQLCLIENT=OFF or -DENABLE_MARIADBCLIENT=OFF.") -- cgit v1.2.3