diff options
Diffstat (limited to 'CMakeModules')
| -rw-r--r-- | CMakeModules/CPMUtil.cmake | 11 | ||||
| -rw-r--r-- | CMakeModules/DownloadExternals.cmake | 9 |
2 files changed, 11 insertions, 9 deletions
diff --git a/CMakeModules/CPMUtil.cmake b/CMakeModules/CPMUtil.cmake index 6a1384e730..d84c069399 100644 --- a/CMakeModules/CPMUtil.cmake +++ b/CMakeModules/CPMUtil.cmake @@ -126,6 +126,15 @@ function(AddJsonPackage) DISABLED_PLATFORMS ${disabled_platforms} CMAKE_FILENAME ${cmake_filename} ) + + # pass stuff to parent scope + set(${package}_ADDED "${${package}_ADDED}" + PARENT_SCOPE) + set(${package}_SOURCE_DIR "${${package}_SOURCE_DIR}" + PARENT_SCOPE) + set(${package}_BINARY_DIR "${${package}_BINARY_DIR}" + PARENT_SCOPE) + return() endif() @@ -598,7 +607,9 @@ function(AddCIPackage) if (DEFINED ARTIFACT_DIR) include(${ARTIFACT_DIR}/${ARTIFACT_CMAKE}.cmake) + set(${ARTIFACT_PACKAGE}_ADDED TRUE PARENT_SCOPE) + set(${ARTIFACT_PACKAGE}_SOURCE_DIR "${ARTIFACT_DIR}" PARENT_SCOPE) else() find_package(${ARTIFACT_PACKAGE} ${ARTIFACT_MIN_VERSION} REQUIRED) endif() diff --git a/CMakeModules/DownloadExternals.cmake b/CMakeModules/DownloadExternals.cmake index 88fa183061..6c4afc03be 100644 --- a/CMakeModules/DownloadExternals.cmake +++ b/CMakeModules/DownloadExternals.cmake @@ -51,15 +51,6 @@ function(download_bundled_external remote_path lib_name cpm_key prefix_var versi message(STATUS "Using bundled binaries at ${${cpm_key}_SOURCE_DIR}") endfunction() -function(download_win_archives) - set(FORCE_WIN_ARCHIVES ON) - set(FFmpeg_EXT_NAME "ffmpeg-7.1.1") - - download_bundled_external("ffmpeg/" ${FFmpeg_EXT_NAME} "ffmpeg-bundled" "" 7.1.1) - - set(FORCE_WIN_ARCHIVES OFF) -endfunction() - function(download_moltenvk_external platform version) set(MOLTENVK_DIR "${CMAKE_BINARY_DIR}/externals/MoltenVK") set(MOLTENVK_TAR "${CMAKE_BINARY_DIR}/externals/MoltenVK.tar") |