github/chiaki
1
0
Fork 0
mirror of https://git.sr.ht/~thestr4ng3r/chiaki synced 2025-08-19 21:13:12 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

FFMPEG vars fix

Browse source
This commit is contained in:
Florian Märkl 2019-08-18 17:51:30 +02:00
commit d89b57cee0
No known key found for this signature in database
GPG key ID: 125BC8A5A6A1E857
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.travis.yml
View file

@ -20,6 +20,7 @@ matrix:
- qt512svg - qt512svg
- libgl1-mesa-dev - libgl1-mesa-dev
- nasm - nasm
- libsdl2-dev
env: env:
- CMAKE_PREFIX_PATH="$TRAVIS_BUILD_DIR/ffmpeg-prefix;/opt/qt512" - CMAKE_PREFIX_PATH="$TRAVIS_BUILD_DIR/ffmpeg-prefix;/opt/qt512"
- CMAKE_EXTRA_ARGS="-DCMAKE_INSTALL_PREFIX=/usr" - CMAKE_EXTRA_ARGS="-DCMAKE_INSTALL_PREFIX=/usr"
@ -57,7 +58,8 @@ script:
-DCMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH -DCMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH
-DCHIAKI_ENABLE_TESTS=ON -DCHIAKI_ENABLE_TESTS=ON
-DCHIAKI_ENABLE_CLI=OFF -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 $CMAKE_EXTRA_ARGS
.. ..
- make -j4 - make -j4

6
cmake/FindFFMPEG.cmake
View file

@ -210,9 +210,13 @@ if (FFMPEG_INCLUDE_DIRS)
list(REMOVE_DUPLICATES FFMPEG_INCLUDE_DIRS) list(REMOVE_DUPLICATES FFMPEG_INCLUDE_DIRS)
endif () endif ()
if(_ffmpeg_required_vars)
set(_ffmpeg_required_vars REQUIRED_VARS ${_ffmpeg_required_vars})
endif()
include(FindPackageHandleStandardArgs) include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(FFMPEG find_package_handle_standard_args(FFMPEG
REQUIRED_VARS ${_ffmpeg_required_vars} ${_ffmpeg_required_vars}
VERSION_VAR FFMPEG_VERSION VERSION_VAR FFMPEG_VERSION
HANDLE_COMPONENTS) HANDLE_COMPONENTS)
unset(_ffmpeg_required_vars) unset(_ffmpeg_required_vars)