diff options
| author | crueter <crueter@eden-emu.dev> | 2026-07-06 23:11:39 +0200 |
|---|---|---|
| committer | crueter <crueter@eden-emu.dev> | 2026-07-06 23:11:39 +0200 |
| commit | 66b073ab8d427d8fc06ffd715151f372cdde818c (patch) | |
| tree | 667e34c22f542d809a069738bd762a23786814c7 /.patch | |
| parent | 4c65780f11511b20c2e0288a287faace16516d38 (diff) | |
[cmake] CPMUtil rewrite of the day number 852 (#4130)
Composite PR for several changes to CPMUtil, most notably:
- https://git.crueter.xyz/CMake/CPMUtil/pulls/19
- https://git.crueter.xyz/CMake/CPMUtil/pulls/22
- https://git.crueter.xyz/CMake/CPMUtil/pulls/24
- https://git.crueter.xyz/CMake/CPMUtil/pulls/25
These contain a lot of changes that generally simplify control flow and improve ease-of-use. Read those descriptions and patchsets for more info.
Signed-off-by: crueter <crueter@eden-emu.dev>
Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/4130
Reviewed-by: CamilleLaVey <camillelavey99@gmail.com>
Reviewed-by: MaranBr <maranbr@eden-emu.dev>
Diffstat (limited to '.patch')
| -rw-r--r-- | .patch/libadrenotools/0001-linkerns-cpm.patch | 20 | ||||
| -rw-r--r-- | .patch/libadrenotools/0001-use-cpmfile-def-for-linkernsbypass.patch | 26 |
2 files changed, 26 insertions, 20 deletions
diff --git a/.patch/libadrenotools/0001-linkerns-cpm.patch b/.patch/libadrenotools/0001-linkerns-cpm.patch deleted file mode 100644 index 8c5abe28e5..0000000000 --- a/.patch/libadrenotools/0001-linkerns-cpm.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 16c6092..9e75548 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -8,7 +8,14 @@ project(adrenotools LANGUAGES CXX C) - - set(GEN_INSTALL_TARGET OFF CACHE BOOL "") - --add_subdirectory(lib/linkernsbypass) -+include(CPM) -+set(CPM_USE_LOCAL_PACKAGES OFF) -+ -+CPMAddPackage( -+ NAME linkernsbypass -+ URL "https://github.com/bylaws/liblinkernsbypass/archive/aa3975893d.zip" -+ URL_HASH SHA512=43d3d146facb7ec99d066a9b8990369ab7b9eec0d5f9a67131b0a0744fde0af27d884ca1f2a272cd113718a23356530ed97703c8c0659c4c25948d50c106119e -+) - - set(LIB_SOURCES src/bcenabler.cpp - src/driver.cpp diff --git a/.patch/libadrenotools/0001-use-cpmfile-def-for-linkernsbypass.patch b/.patch/libadrenotools/0001-use-cpmfile-def-for-linkernsbypass.patch new file mode 100644 index 0000000000..965975cda5 --- /dev/null +++ b/.patch/libadrenotools/0001-use-cpmfile-def-for-linkernsbypass.patch @@ -0,0 +1,26 @@ +From 52bbc5af6523daa22ad62fe4b84bc8d623d11a53 Mon Sep 17 00:00:00 2001 +From: crueter <crueter@eden-emu.dev> +Date: Fri, 26 Jun 2026 01:09:40 -0400 +Subject: [PATCH] use cpmfile def for linkernsbypass + +--- + CMakeLists.txt | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 16c6092..85b242c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -8,7 +8,8 @@ project(adrenotools LANGUAGES CXX C) + + set(GEN_INSTALL_TARGET OFF CACHE BOOL "") + +-add_subdirectory(lib/linkernsbypass) ++include(CPMUtil) ++AddJsonPackage(linkernsbypass) + + set(LIB_SOURCES src/bcenabler.cpp + src/driver.cpp +-- +2.54.0 + |