From d89b57cee041b937d6fa1ce854e1d8a1edb45c15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=A4rkl?= <info@florianmaerkl.de>
Date: Sun, 18 Aug 2019 17:51:30 +0200
Subject: [PATCH] FFMPEG vars fix

---
 .travis.yml            | 4 +++-
 cmake/FindFFMPEG.cmake | 6 +++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4c3c326..52f8990 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,6 +20,7 @@ matrix:
             - qt512svg
             - libgl1-mesa-dev
             - nasm
+            - libsdl2-dev
       env:
         - CMAKE_PREFIX_PATH="$TRAVIS_BUILD_DIR/ffmpeg-prefix;/opt/qt512"
         - CMAKE_EXTRA_ARGS="-DCMAKE_INSTALL_PREFIX=/usr"
@@ -57,7 +58,8 @@ script:
       -DCMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH
       -DCHIAKI_ENABLE_TESTS=ON
       -DCHIAKI_ENABLE_CLI=OFF
-      -DCHIAKI_GUI_ENABLE_QT_GAMEPAD=ON
+      -DCHIAKI_GUI_ENABLE_QT_GAMEPAD=OFF
+      -DCHIAKI_GUI_ENABLE_SDL_GAMECONTROLLER=ON
       $CMAKE_EXTRA_ARGS
       ..
   - make -j4
diff --git a/cmake/FindFFMPEG.cmake b/cmake/FindFFMPEG.cmake
index 124c3a5..7822efe 100644
--- a/cmake/FindFFMPEG.cmake
+++ b/cmake/FindFFMPEG.cmake
@@ -210,9 +210,13 @@ if (FFMPEG_INCLUDE_DIRS)
   list(REMOVE_DUPLICATES FFMPEG_INCLUDE_DIRS)
 endif ()
 
+if(_ffmpeg_required_vars)
+  set(_ffmpeg_required_vars REQUIRED_VARS ${_ffmpeg_required_vars})
+endif()
+
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(FFMPEG
-  REQUIRED_VARS ${_ffmpeg_required_vars}
+  ${_ffmpeg_required_vars}
   VERSION_VAR FFMPEG_VERSION
   HANDLE_COMPONENTS)
 unset(_ffmpeg_required_vars)