eden-emu/eden
24
3
Fork 15
Code Issues 138 Pull requests 56 Projects 1 Releases Packages Wiki Activity Actions

Make fmt an external
Some checks failed
eden-license / license-header (pull_request) Failing after 23s
Details

Browse source 
OpenIndiana does not package it

Signed-off-by: crueter <crueter@eden-emu.dev>
This commit is contained in:
crueter 2025-10-04 18:59:25 -04:00
parent 128168c868
commit 39c55b6acf
Signed by: crueter
GPG key ID: 425ACD2D4830EBC6
4 changed files with 11 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
CMakeLists.txt
View file

@ -429,9 +429,6 @@ if (YUZU_USE_CPM)
endif() endif()
endif() endif()
# fmt
AddJsonPackage(fmt)
# lz4 # lz4
AddJsonPackage(lz4) AddJsonPackage(lz4)
@ -473,8 +470,6 @@ if (YUZU_USE_CPM)
endif() endif()
else() else()
# Enforce the search mode of non-required packages for better and shorter failure messages # Enforce the search mode of non-required packages for better and shorter failure messages
find_package(fmt 8 REQUIRED)
if (NOT YUZU_DISABLE_LLVM) if (NOT YUZU_DISABLE_LLVM)
find_package(LLVM MODULE COMPONENTS Demangle) find_package(LLVM MODULE COMPONENTS Demangle)
endif() endif()
@ -544,6 +539,7 @@ find_package(VulkanUtilityLibraries)
find_package(SimpleIni) find_package(SimpleIni)
find_package(SPIRV-Tools) find_package(SPIRV-Tools)
find_package(sirit) find_package(sirit)
find_package(fmt)
if (ARCHITECTURE_x86 OR ARCHITECTURE_x86_64) if (ARCHITECTURE_x86 OR ARCHITECTURE_x86_64)
find_package(xbyak) find_package(xbyak)

7
cpmfile.json
View file

@ -25,13 +25,6 @@
"0003-armasm-options.patch" "0003-armasm-options.patch"
] ]
}, },
"fmt": {
"repo": "fmtlib/fmt",
"tag": "%VERSION%",
"hash": "c4ab814c20fbad7e3f0ae169125a4988a2795631194703251481dc36b18da65c886c4faa9acd046b0a295005217b3689eb0126108a9ba5aac2ca909aae263c2f",
"version": "8",
"git_version": "12.0.0"
},
"lz4": { "lz4": {
"name": "lz4", "name": "lz4",
"repo": "lz4/lz4", "repo": "lz4/lz4",

3
externals/CMakeLists.txt vendored
View file

@ -39,6 +39,9 @@ if (ARCHITECTURE_arm64 OR DYNARMIC_TESTS)
AddJsonPackage(oaknut) AddJsonPackage(oaknut)
endif() endif()
# fmt
AddJsonPackage(fmt)
# enet # enet
AddJsonPackage(enet) AddJsonPackage(enet)

7
externals/cpmfile.json vendored
View file

@ -198,5 +198,12 @@
"key": "steamdeck", "key": "steamdeck",
"bundled": true, "bundled": true,
"skip_updates": "true" "skip_updates": "true"
},
"fmt": {
"repo": "fmtlib/fmt",
"tag": "%VERSION%",
"hash": "c4ab814c20fbad7e3f0ae169125a4988a2795631194703251481dc36b18da65c886c4faa9acd046b0a295005217b3689eb0126108a9ba5aac2ca909aae263c2f",
"version": "8",
"git_version": "12.0.0"
} }
} }