Просмотр исходного кода

externals: fix a regression when using MSVC

liushuyu 4 лет назад
Родитель
Сommit
3ae9258efe
2 измененных файлов с 2 добавлено и 1 удалено
  1. 1 0
      externals/CMakeLists.txt
  2. 1 1
      externals/ffmpeg/CMakeLists.txt

+ 1 - 0
externals/CMakeLists.txt

@@ -125,4 +125,5 @@ endif()
 # FFMpeg
 if (YUZU_USE_BUNDLED_FFMPEG)
     add_subdirectory(ffmpeg)
+    set(FFmpeg_PATH "${FFmpeg_PATH}" PARENT_SCOPE)
 endif()

+ 1 - 1
externals/ffmpeg/CMakeLists.txt

@@ -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}")
+    set(FFmpeg_PATH "${CMAKE_BINARY_DIR}/externals/${FFmpeg_EXT_NAME}" PARENT_SCOPE)
     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)