Browse Source
externals/ffmpeg: set the cmake variable twice ...
... to avoid leaving variable undefined in the current scope
pull/15/merge
liushuyu
4 years ago
No known key found for this signature in database
GPG Key ID: 23D1CE4534419437
2 changed files with
13 additions and
5 deletions
-
externals/CMakeLists.txt
-
externals/ffmpeg/CMakeLists.txt
|
|
|
@ -126,4 +126,7 @@ endif() |
|
|
|
if (YUZU_USE_BUNDLED_FFMPEG) |
|
|
|
add_subdirectory(ffmpeg) |
|
|
|
set(FFmpeg_PATH "${FFmpeg_PATH}" PARENT_SCOPE) |
|
|
|
set(FFmpeg_LDFLAGS "${FFmpeg_LDFLAGS}" PARENT_SCOPE) |
|
|
|
set(FFmpeg_LIBRARIES "${FFmpeg_LIBRARIES}" PARENT_SCOPE) |
|
|
|
set(FFmpeg_INCLUDE_DIR "${FFmpeg_INCLUDE_DIR}" PARENT_SCOPE) |
|
|
|
endif() |
|
|
|
@ -192,7 +192,7 @@ if (NOT WIN32) |
|
|
|
else(WIN32) |
|
|
|
# Use yuzu FFmpeg binaries |
|
|
|
set(FFmpeg_EXT_NAME "ffmpeg-4.4") |
|
|
|
set(FFmpeg_PATH "${CMAKE_BINARY_DIR}/externals/${FFmpeg_EXT_NAME}" PARENT_SCOPE) |
|
|
|
set(FFmpeg_PATH "${CMAKE_BINARY_DIR}/externals/${FFmpeg_EXT_NAME}") |
|
|
|
download_bundled_external("ffmpeg/" ${FFmpeg_EXT_NAME} "") |
|
|
|
set(FFmpeg_FOUND YES) |
|
|
|
set(FFmpeg_INCLUDE_DIR "${FFmpeg_PATH}/include" CACHE PATH "Path to FFmpeg headers" FORCE) |
|
|
|
@ -204,6 +204,11 @@ else(WIN32) |
|
|
|
${FFmpeg_LIBRARY_DIR}/avcodec.lib |
|
|
|
${FFmpeg_LIBRARY_DIR}/avutil.lib |
|
|
|
CACHE PATH "Paths to FFmpeg libraries" FORCE) |
|
|
|
# exported variables |
|
|
|
set(FFmpeg_PATH "${FFmpeg_PATH}" PARENT_SCOPE) |
|
|
|
set(FFmpeg_LDFLAGS "${FFmpeg_LDFLAGS}" PARENT_SCOPE) |
|
|
|
set(FFmpeg_LIBRARIES "${FFmpeg_LIBRARIES}" PARENT_SCOPE) |
|
|
|
set(FFmpeg_INCLUDE_DIR "${FFmpeg_INCLUDE_DIR}" PARENT_SCOPE) |
|
|
|
endif(WIN32) |
|
|
|
|
|
|
|
unset(FFmpeg_COMPONENTS) |
