[cmake] CPMUtil: explicit ARTIFACT_OVERRIDE

Signed-off-by: crueter <crueter@eden-emu.dev>
This commit is contained in:
crueter 2025-08-21 16:34:57 -04:00
parent 88b1fa9650
commit 0fb98d7487

View file

@ -269,7 +269,7 @@ function(add_ci_package key)
DOWNLOAD_ONLY ON DOWNLOAD_ONLY ON
) )
if (NOT ARTIFACT_FORCE_DOWNLOAD) if (NOT ARTIFACT_FORCE_DOWNLOAD OR ARTIFACT_OVERRIDE)
set(ARTIFACT_DIR ${${ARTIFACT_PACKAGE}-${key}_SOURCE_DIR} PARENT_SCOPE) set(ARTIFACT_DIR ${${ARTIFACT_PACKAGE}-${key}_SOURCE_DIR} PARENT_SCOPE)
endif() endif()
endfunction() endfunction()
@ -338,72 +338,65 @@ function(AddCIPackage)
if ((MSVC AND ARCHITECTURE_x86_64) OR ARTIFACT_FORCE_DOWNLOAD AND NOT "windows-amd64" IN_LIST DISABLED_PLATFORMS) if ((MSVC AND ARCHITECTURE_x86_64) OR ARTIFACT_FORCE_DOWNLOAD AND NOT "windows-amd64" IN_LIST DISABLED_PLATFORMS)
# kinda hacky # kinda hacky
if(MSVC AND ARCHITECTURE_x86_64) if(MSVC AND ARCHITECTURE_x86_64)
set(ARTIFACT_FORCE_DOWNLOAD OFF) set(ARTIFACT_OVERRIDE ON)
else()
set(ARTIFACT_FORCE_DOWNLOAD ON)
endif() endif()
add_ci_package(windows-amd64) add_ci_package(windows-amd64)
set(ARTIFACT_OVERRIDE OFF)
endif() endif()
if ((MSVC AND ARCHITECTURE_arm64) OR ARTIFACT_FORCE_DOWNLOAD AND NOT "windows-arm64" IN_LIST DISABLED_PLATFORMS) if ((MSVC AND ARCHITECTURE_arm64) OR ARTIFACT_FORCE_DOWNLOAD AND NOT "windows-arm64" IN_LIST DISABLED_PLATFORMS)
if(MSVC AND ARCHITECTURE_arm64) if(MSVC AND ARCHITECTURE_arm64)
set(ARTIFACT_FORCE_DOWNLOAD OFF) set(ARTIFACT_OVERRIDE ON)
else()
set(ARTIFACT_FORCE_DOWNLOAD ON)
endif() endif()
add_ci_package(windows-arm64) add_ci_package(windows-arm64)
set(ARTIFACT_OVERRIDE OFF)
endif() endif()
if (ANDROID OR ARTIFACT_FORCE_DOWNLOAD AND NOT "android" IN_LIST DISABLED_PLATFORMS) if (ANDROID OR ARTIFACT_FORCE_DOWNLOAD AND NOT "android" IN_LIST DISABLED_PLATFORMS)
if(ANDROID) if(ANDROID)
set(ARTIFACT_FORCE_DOWNLOAD OFF) set(ARTIFACT_OVERRIDE ON)
else()
set(ARTIFACT_FORCE_DOWNLOAD ON)
endif() endif()
add_ci_package(android) add_ci_package(android)
set(ARTIFACT_OVERRIDE OFF)
endif() endif()
if(PLATFORM_SUN OR ARTIFACT_FORCE_DOWNLOAD AND NOT "solaris" IN_LIST DISABLED_PLATFORMS) if(PLATFORM_SUN OR ARTIFACT_FORCE_DOWNLOAD AND NOT "solaris" IN_LIST DISABLED_PLATFORMS)
if(PLATFORM_SUN) if(PLATFORM_SUN)
set(ARTIFACT_FORCE_DOWNLOAD OFF) set(ARTIFACT_OVERRIDE ON)
else()
set(ARTIFACT_FORCE_DOWNLOAD ON)
endif() endif()
add_ci_package(solaris) add_ci_package(solaris)
set(ARTIFACT_OVERRIDE OFF)
endif() endif()
if(PLATFORM_FREEBSD OR ARTIFACT_FORCE_DOWNLOAD AND NOT "freebsd" IN_LIST DISABLED_PLATFORMS) if(PLATFORM_FREEBSD OR ARTIFACT_FORCE_DOWNLOAD AND NOT "freebsd" IN_LIST DISABLED_PLATFORMS)
if(PLATFORM_FREEBSD) if(PLATFORM_FREEBSD)
set(ARTIFACT_FORCE_DOWNLOAD OFF) set(ARTIFACT_OVERRIDE ON)
else()
set(ARTIFACT_FORCE_DOWNLOAD ON)
endif() endif()
add_ci_package(freebsd) add_ci_package(freebsd)
set(ARTIFACT_OVERRIDE OFF)
endif() endif()
if((PLATFORM_LINUX AND ARCHITECTURE_x86_64) OR ARTIFACT_FORCE_DOWNLOAD AND NOT "linux" IN_LIST DISABLED_PLATFORMS) if((PLATFORM_LINUX AND ARCHITECTURE_x86_64) OR ARTIFACT_FORCE_DOWNLOAD AND NOT "linux" IN_LIST DISABLED_PLATFORMS)
if(PLATFORM_LINUX AND ARCHITECTURE_x86_64) if(PLATFORM_LINUX AND ARCHITECTURE_x86_64)
set(ARTIFACT_FORCE_DOWNLOAD OFF) set(ARTIFACT_OVERRIDE ON)
else()
set(ARTIFACT_FORCE_DOWNLOAD ON)
endif() endif()
add_ci_package(linux) add_ci_package(linux)
set(ARTIFACT_OVERRIDE OFF)
endif() endif()
if((PLATFORM_LINUX AND ARCHITECTURE_arm64) OR ARTIFACT_FORCE_DOWNLOAD AND NOT "linux-aarch64" IN_LIST DISABLED_PLATFORMS) if((PLATFORM_LINUX AND ARCHITECTURE_arm64) OR ARTIFACT_FORCE_DOWNLOAD AND NOT "linux-aarch64" IN_LIST DISABLED_PLATFORMS)
if(PLATFORM_LINUX AND ARCHITECTURE_arm64) if(PLATFORM_LINUX AND ARCHITECTURE_arm64)
set(ARTIFACT_FORCE_DOWNLOAD OFF) set(ARTIFACT_OVERRIDE ON)
else()
set(ARTIFACT_FORCE_DOWNLOAD ON)
endif() endif()
add_ci_package(linux-aarch64) add_ci_package(linux-aarch64)
set(ARTIFACT_OVERRIDE OFF)
endif() endif()
if (DEFINED ARTIFACT_DIR) if (DEFINED ARTIFACT_DIR)