From 2e9dbe3f1d8133570cd9db92aa05769733451029 Mon Sep 17 00:00:00 2001 From: crueter Date: Mon, 20 Oct 2025 03:43:15 +0200 Subject: [cmake, tools, docs] Update CPMUtil (#2790) updates CPMUtil to [`8f9b39fc98`](https://git.crueter.xyz/CMake/CPMUtil/commit/8f9b39fc980fc7079c7c4471c19f219180abe368) Makes the tooling/docs better and enforces usage of tar.gz everywhere as opposed to zips Signed-off-by: crueter Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/2790 Reviewed-by: CamilleLaVey Reviewed-by: MaranBr --- CMakeModules/CPM.cmake | 5 +++++ CMakeModules/CPMUtil.cmake | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'CMakeModules') diff --git a/CMakeModules/CPM.cmake b/CMakeModules/CPM.cmake index 5544d8eefe..2d97f5493c 100644 --- a/CMakeModules/CPM.cmake +++ b/CMakeModules/CPM.cmake @@ -1,3 +1,8 @@ +# SPDX-FileCopyrightText: Copyright 2025 crueter +# SPDX-License-Identifier: GPL-3.0-or-later + +# This is a slightly modified version of CPM.cmake + # CPM.cmake - CMake's missing package manager # =========================================== # See https://github.com/cpm-cmake/CPM.cmake for usage and update instructions. diff --git a/CMakeModules/CPMUtil.cmake b/CMakeModules/CPMUtil.cmake index 3d7b84c029..c2bd47aaf8 100644 --- a/CMakeModules/CPMUtil.cmake +++ b/CMakeModules/CPMUtil.cmake @@ -325,7 +325,7 @@ function(AddPackage) ${pkg_git_url}/archive/refs/tags/${PKG_ARGS_TAG}.tar.gz) endif() elseif (DEFINED PKG_ARGS_SHA) - set(pkg_url "${pkg_git_url}/archive/${PKG_ARGS_SHA}.zip") + set(pkg_url "${pkg_git_url}/archive/${PKG_ARGS_SHA}.tar.gz") else() if (DEFINED PKG_ARGS_BRANCH) set(PKG_BRANCH ${PKG_ARGS_BRANCH}) @@ -335,7 +335,7 @@ function(AddPackage) set(PKG_BRANCH master) endif() - set(pkg_url ${pkg_git_url}/archive/refs/heads/${PKG_BRANCH}.zip) + set(pkg_url ${pkg_git_url}/archive/refs/heads/${PKG_BRANCH}.tar.gz) endif() else() cpm_utils_message(FATAL_ERROR ${PKG_ARGS_NAME} "No URL or repository defined") -- cgit v1.2.3