summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar liushuyu2021-12-15 00:27:12 -0700
committerGravatar liushuyu2021-12-15 20:57:01 -0700
commit3ae9258efe9b246b5a391aa4f0c822a7867e0843 (patch)
treeeb3c205c7e19ffc75903f69f79a370dde7aa1171
parentvideo_core/codecs: (re-spin) refactor ffmpeg searching and handling (diff)
downloadyuzu-3ae9258efe9b246b5a391aa4f0c822a7867e0843.tar.gz
yuzu-3ae9258efe9b246b5a391aa4f0c822a7867e0843.tar.xz
yuzu-3ae9258efe9b246b5a391aa4f0c822a7867e0843.zip
externals: fix a regression when using MSVC
-rw-r--r--externals/CMakeLists.txt1
-rw-r--r--externals/ffmpeg/CMakeLists.txt2
2 files changed, 2 insertions, 1 deletions
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index bbbe6667d..6457387b4 100644
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@@ -125,4 +125,5 @@ endif()
125# FFMpeg 125# FFMpeg
126if (YUZU_USE_BUNDLED_FFMPEG) 126if (YUZU_USE_BUNDLED_FFMPEG)
127 add_subdirectory(ffmpeg) 127 add_subdirectory(ffmpeg)
128 set(FFmpeg_PATH "${FFmpeg_PATH}" PARENT_SCOPE)
128endif() 129endif()
diff --git a/externals/ffmpeg/CMakeLists.txt b/externals/ffmpeg/CMakeLists.txt
index 7da89d2c5..93bd06fd7 100644
--- a/externals/ffmpeg/CMakeLists.txt
+++ b/externals/ffmpeg/CMakeLists.txt
@@ -192,7 +192,7 @@ if (NOT WIN32)
192else(WIN32) 192else(WIN32)
193 # Use yuzu FFmpeg binaries 193 # Use yuzu FFmpeg binaries
194 set(FFmpeg_EXT_NAME "ffmpeg-4.4") 194 set(FFmpeg_EXT_NAME "ffmpeg-4.4")
195 set(FFmpeg_PATH "${CMAKE_BINARY_DIR}/externals/${FFmpeg_EXT_NAME}") 195 set(FFmpeg_PATH "${CMAKE_BINARY_DIR}/externals/${FFmpeg_EXT_NAME}" PARENT_SCOPE)
196 download_bundled_external("ffmpeg/" ${FFmpeg_EXT_NAME} "") 196 download_bundled_external("ffmpeg/" ${FFmpeg_EXT_NAME} "")
197 set(FFmpeg_FOUND YES) 197 set(FFmpeg_FOUND YES)
198 set(FFmpeg_INCLUDE_DIR "${FFmpeg_PATH}/include" CACHE PATH "Path to FFmpeg headers" FORCE) 198 set(FFmpeg_INCLUDE_DIR "${FFmpeg_PATH}/include" CACHE PATH "Path to FFmpeg headers" FORCE)