[cmake] refactor: Use CPM over submodules #143

Merged
crueter merged 42 commits from refactor/cpm into master 2025-08-04 04:50:17 +02:00
3 changed files with 13 additions and 10 deletions
Showing only changes of commit ad887e71cf - Show all commits

View file

@ -106,10 +106,10 @@ if (YUZU_USE_EXTERNAL_SDL2)
endif() endif()
CPMAddPackage( CPMAddPackage(
NAME SDL2 NAME SDL2
URL "https://github.com/libsdl-org/SDL/archive/${SDL_HASH}.zip" URL "https://github.com/libsdl-org/SDL/archive/${SDL_HASH}.zip"
URL_HASH SHA512=${SDL_SHA512SUM} URL_HASH SHA512=${SDL_SHA512SUM}
) )
endif() endif()
# ENet # ENet
@ -174,8 +174,7 @@ endif()
CPMAddPackage( CPMAddPackage(
NAME VulkanHeaders NAME VulkanHeaders
VERSION 1.3.274 VERSION 1.3.274
GIT_REPOSITORY "https://github.com/KhronosGroup/Vulkan-Headers.git" URL "https://github.com/KhronosGroup/Vulkan-Headers/archive/89268a6d17.zip"
GIT_TAG 89268a6d17
) )
# Vulkan-Utility-Libraries # Vulkan-Utility-Libraries
@ -187,8 +186,7 @@ endif()
CPMAddPackage( CPMAddPackage(
NAME VulkanUtilityLibraries NAME VulkanUtilityLibraries
GIT_REPOSITORY "https://github.com/KhronosGroup/Vulkan-Utility-Libraries.git" URL "https://github.com/KhronosGroup/Vulkan-Utility-Libraries/archive/df2e358152.zip"
GIT_TAG df2e358152
) )
# SPIRV-Tools # SPIRV-Tools

1
externals/cubeb vendored Submodule

@ -0,0 +1 @@
Subproject commit fa021607121360af7c171d881dc5bc8af7bb56eb

View file

@ -1,11 +1,15 @@
# SPDX-FileCopyrightText: 2025 Eden Emulator Project # SPDX-FileCopyrightText: 2025 Eden Emulator Project
# SPDX-License-Identifier: GPL-3.0-or-later # SPDX-License-Identifier: GPL-3.0-or-later
# TODO(crueter): Create a common CPMUtil.cmake that does this for me
include(CPM) include(CPM)
set(CPM_USE_LOCAL_PACKAGES ON) set(CPM_USE_LOCAL_PACKAGES OFF)
CPMAddPackage( 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 FIND_PACKAGE_ARGUMENTS "CONFIG" # not sure this works outside of gentoo
OPTIONS
"USE_SANITIZERS OFF"
) )
if (cubeb_ADDED) if (cubeb_ADDED)