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

[cmake] update CI deps, feat: sirit CI + new CI spec #2655

Merged
crueter merged 9 commits from update-deps into master 2025-10-04 09:27:14 +02:00
Conversation 3 Commits 9 Files changed 13 +6 -3
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit b87f446221 - Show all commits

7
CMakeLists.txt
View file

@ -317,7 +317,6 @@ endif()
if (ARCHITECTURE_arm64 AND (ANDROID OR PLATFORM_LINUX)) if (ARCHITECTURE_arm64 AND (ANDROID OR PLATFORM_LINUX))
set(HAS_NCE 1) set(HAS_NCE 1)
add_compile_definitions(HAS_NCE=1) add_compile_definitions(HAS_NCE=1)
find_package(oaknut 2.0.1)
endif() endif()
if (YUZU_ROOM) if (YUZU_ROOM)
@ -502,7 +501,7 @@ if (YUZU_USE_CPM)
if (SPIRV-Tools_FORCE_BUNDLED) if (SPIRV-Tools_FORCE_BUNDLED)
set(NEED_SPIRV_HEADERS ON) set(NEED_SPIRV_HEADERS ON)
else() else()
find_package(SPIRV-Tools MODULE OPTIONAL QUIET) find_package(SPIRV-Tools MODULE QUIET)
if (NOT SPIRV-Tools_FOUND) if (NOT SPIRV-Tools_FOUND)
set(NEED_SPIRV_HEADERS ON) set(NEED_SPIRV_HEADERS ON)
else() else()
@ -703,6 +702,10 @@ if (ENABLE_WEB_SERVICE OR ENABLE_QT_UPDATE_CHECKER)
find_package(cpp-jwt) find_package(cpp-jwt)
endif() endif()
if (ARCHITECTURE_arm64 OR DYNARMIC_TESTS)
find_package(oaknut)
endif()
if (ENABLE_QT) if (ENABLE_QT)
if (YUZU_USE_BUNDLED_QT) if (YUZU_USE_BUNDLED_QT)
download_qt(6.8.3) download_qt(6.8.3)

2
externals/cpmfile.json vendored
View file

@ -8,7 +8,7 @@
}, },
"sirit": { "sirit": {
"repo": "eden-emulator/sirit", "repo": "eden-emulator/sirit",
"version": "1.0.0", "version": "1.0.1",
"tag": "v%VERSION%", "tag": "v%VERSION%",
"artifact": "sirit-source-%VERSION%.tar.zst", "artifact": "sirit-source-%VERSION%.tar.zst",
"hash_suffix": "sha512sum", "hash_suffix": "sha512sum",