From ad887e71cf899f3798c1847716e9f994e362b30b Mon Sep 17 00:00:00 2001 From: crueter Date: Mon, 28 Jul 2025 00:45:58 -0400 Subject: [PATCH] [cmake] use source archives Signed-off-by: crueter --- externals/CMakeLists.txt | 14 ++++++-------- externals/cubeb | 1 + src/audio_core/externals/cubeb/CMakeLists.txt | 8 ++++++-- 3 files changed, 13 insertions(+), 10 deletions(-) create mode 160000 externals/cubeb diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index 96d6d04c95..830e30ca27 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -106,10 +106,10 @@ if (YUZU_USE_EXTERNAL_SDL2) endif() CPMAddPackage( - NAME SDL2 - URL "https://github.com/libsdl-org/SDL/archive/${SDL_HASH}.zip" - URL_HASH SHA512=${SDL_SHA512SUM} - ) + NAME SDL2 + URL "https://github.com/libsdl-org/SDL/archive/${SDL_HASH}.zip" + URL_HASH SHA512=${SDL_SHA512SUM} + ) endif() # ENet @@ -174,8 +174,7 @@ endif() CPMAddPackage( NAME VulkanHeaders VERSION 1.3.274 - GIT_REPOSITORY "https://github.com/KhronosGroup/Vulkan-Headers.git" - GIT_TAG 89268a6d17 + URL "https://github.com/KhronosGroup/Vulkan-Headers/archive/89268a6d17.zip" ) # Vulkan-Utility-Libraries @@ -187,8 +186,7 @@ endif() CPMAddPackage( NAME VulkanUtilityLibraries - GIT_REPOSITORY "https://github.com/KhronosGroup/Vulkan-Utility-Libraries.git" - GIT_TAG df2e358152 + URL "https://github.com/KhronosGroup/Vulkan-Utility-Libraries/archive/df2e358152.zip" ) # SPIRV-Tools diff --git a/externals/cubeb b/externals/cubeb new file mode 160000 index 0000000000..fa02160712 --- /dev/null +++ b/externals/cubeb @@ -0,0 +1 @@ +Subproject commit fa021607121360af7c171d881dc5bc8af7bb56eb diff --git a/src/audio_core/externals/cubeb/CMakeLists.txt b/src/audio_core/externals/cubeb/CMakeLists.txt index 789b3a9a6f..80caa71c44 100644 --- a/src/audio_core/externals/cubeb/CMakeLists.txt +++ b/src/audio_core/externals/cubeb/CMakeLists.txt @@ -1,11 +1,15 @@ # SPDX-FileCopyrightText: 2025 Eden Emulator Project # SPDX-License-Identifier: GPL-3.0-or-later +# TODO(crueter): Create a common CPMUtil.cmake that does this for me include(CPM) -set(CPM_USE_LOCAL_PACKAGES ON) +set(CPM_USE_LOCAL_PACKAGES OFF) CPMAddPackage( - URI "gh:mozilla/cubeb#fa02160712" + NAME cubeb + URL "https://github.com/mozilla/cubeb/archive/fa02160712.zip" FIND_PACKAGE_ARGUMENTS "CONFIG" # not sure this works outside of gentoo + OPTIONS + "USE_SANITIZERS OFF" ) if (cubeb_ADDED)