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

[cmake] fix issues when using CPMUTIL_FORCE_SYSTEM #399

Merged
crueter merged 6 commits from marcin-serwin/eden:push-oxnknwkznumv into master 2025-09-10 18:36:43 +02:00
Conversation 4 Commits 6 Files changed 6 +30 -4
marcin-serwin commented 2025-09-09 23:03:12 +02:00
Member
Copy link
No description provided.
marcin-serwin added 1 commit 2025-09-09 23:03:13 +02:00 
Signed-off-by: Marcin Serwin <marcin@serwin.dev>
crueter requested changes 2025-09-09 23:09:00 +02:00
CMakeLists.txt Outdated
@ -479,6 +480,15 @@ else()
endif()
endif()
# Xbyak (also used by Dynarmic and video_core so needs to be added first)
crueter commented 2025-09-09 23:08:05 +02:00
Owner
Copy link

This isn't needed; we should instead do a find_package(xbyak) in root to propagate the target

This isn't needed; we should instead do a find_package(xbyak) in root to propagate the target
marcin-serwin marked this conversation as resolved
CMakeModules/Findsirit.cmake Outdated
@ -0,0 +3,4 @@
include(FindPackageHandleStandardArgs)
find_package(PkgConfig QUIET)
crueter commented 2025-09-09 23:08:19 +02:00
Owner
Copy link

Add MODULE to sirit find_args

Add MODULE to sirit find_args
marcin-serwin marked this conversation as resolved
externals/nx_tzdb/CMakeLists.txt Outdated
@ -59,3 +62,3 @@
DESTINATION
${NX_TZDB_BASE_DIR})
else()
elseif(NOT EXISTS ${NX_TZDB_BASE_DIR})
crueter commented 2025-09-09 23:08:53 +02:00
Owner
Copy link

This doesn't work since cpm uses a different src cache. It already doesn't download if it exists due to CPM

This doesn't work since cpm uses a different src cache. It already doesn't download if it exists due to CPM
marcin-serwin commented 2025-09-10 17:14:25 +02:00
Author
Member
Copy link

This is deliberate, I want to use predownloaded tzdb so I put it in this path before running configuration, I don't use CPM or its cache for this. This is similar to how this worked in yuzu. Perhaps a better way to do it would be some cmake option to set the path beforehand like YUZU_PREDOWNLOADED_TZDB_PATH and we only use CPM if it's undefined? WDYT?

This is deliberate, I want to use predownloaded tzdb so I put it in this path before running configuration, I don't use CPM or its cache for this. This is similar to how this worked in yuzu. Perhaps a better way to do it would be some cmake option to set the path beforehand like `YUZU_PREDOWNLOADED_TZDB_PATH` and we only use CPM if it's undefined? WDYT?
crueter commented 2025-09-10 17:26:38 +02:00
Owner
Copy link

You can use a predownloaded tzdb with tools/cpm-fetch.sh tzdb

You can use a predownloaded tzdb with `tools/cpm-fetch.sh tzdb`
marcin-serwin commented 2025-09-10 17:32:13 +02:00
Author
Member
Copy link

But this involves running CPM and I want to avoid that.

But this involves running CPM and I want to avoid that.
crueter commented 2025-09-10 17:33:35 +02:00
Owner
Copy link

The CPM fetch scripts are fully shell-based, they don't have any CMake going on. It's the same thing as predownloading with e.g wget, it just puts it in a place that CMake can use it.

The CPM fetch scripts are fully shell-based, they don't have any CMake going on. It's the same thing as predownloading with e.g wget, it just puts it in a place that CMake can use it.
marcin-serwin commented 2025-09-10 17:41:48 +02:00
Author
Member
Copy link

This messes up hash of fixed output derivation in Nix and prevents reusing them between builds. I want to use the files predownloaded by Nix and not CPM or any bash script.

This messes up hash of fixed output derivation in Nix and prevents reusing them between builds. I want to use the files predownloaded by Nix and not CPM or any bash script.
crueter commented 2025-09-10 17:57:51 +02:00
Owner
Copy link

Ah, okay; then let's add a set(YUZU_TZDB_PATH "" CACHE STRING "Path to a pre-downloaded timezone database"), and in nx_tzdb do an if(YUZU_TZDB_PATH) check before the MSVC check

Ah, okay; then let's add a `set(YUZU_TZDB_PATH "" CACHE STRING "Path to a pre-downloaded timezone database")`, and in nx_tzdb do an `if(YUZU_TZDB_PATH)` check before the MSVC check
marcin-serwin commented 2025-09-10 18:18:34 +02:00
Author
Member
Copy link

Done

Done
marcin-serwin marked this conversation as resolved
crueter commented 2025-09-09 23:11:26 +02:00
Owner
Copy link

actually we may be able to move xbyak to dynarmic externals? need to check

actually we may be able to move xbyak to dynarmic externals? need to check
marcin-serwin force-pushed push-oxnknwkznumv from 4f6d635edd to 3f7c4927bc 2025-09-10 17:08:10 +02:00 Compare
marcin-serwin force-pushed push-oxnknwkznumv from 3f7c4927bc to 9a9deced46 2025-09-10 18:18:23 +02:00 Compare
marcin-serwin force-pushed push-oxnknwkznumv from 9a9deced46 to 678cb591fd 2025-09-10 18:19:20 +02:00 Compare
crueter approved these changes 2025-09-10 18:33:09 +02:00
externals/nx_tzdb/CMakeLists.txt
@ -36,3 +36,1 @@
# TODO(crueter): This is a terrible solution, but MSVC fails to link without it
# Need to investigate further but I still can't reproduce...
if (MSVC)
if(NOT YUZU_TZDB_PATH STREQUAL "")
crueter commented 2025-09-10 18:32:47 +02:00
Owner
Copy link

STREQUAL "" is technically redundant, if already handles this case, but not a huge deal tbh

`STREQUAL ""` is technically redundant, `if` already handles this case, but not a huge deal tbh
marcin-serwin commented 2025-09-10 18:39:37 +02:00
Author
Member
Copy link

I've had issues with this before and official docs indicate that if(<string>) doesn't really work like that: https://cmake.org/cmake/help/latest/command/if.html#string

I've had issues with this before and official docs indicate that `if(<string>)` doesn't really work like that: https://cmake.org/cmake/help/latest/command/if.html#string
crueter marked this conversation as resolved
MaranBr approved these changes 2025-09-10 18:36:00 +02:00
crueter merged commit 13ecc1e481 into master 2025-09-10 18:36:43 +02:00
crueter deleted branch push-oxnknwkznumv 2025-09-10 18:36:44 +02:00
Sign in to join this conversation.
Reviewers
No reviewers
crueter
MaranBr
Labels
Clear labels   
android

Specific to android platform

  
audio

   
bug

Something is not working

  
ci

For changes to the ci/building

  
confirmed

Used when testers confirm a bug is reported and it is reproducable.

  
core

For core changes to the emulator

  
desktop

Specific to desktop PCs, handhelds, etc.

  
duplicate

This issue or pull request already exists

  
enhancement

New feature

  
frontend

Frontend changes

  
fw

Changes related to firmware

  
git

For enhancements or changes regarding git.

  
graphics

   
loader

For changes to any of the loader implementations

  
nv gpu

For use with changes that involve the emulator GPU and any services.

  
ui
No labels
android
audio
bug
ci
confirmed
core
desktop
duplicate
enhancement
frontend
fw
git
graphics
loader
nv gpu
ui
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
3 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: eden-emu/eden#399
No description provided.
Delete branch "marcin-serwin/eden:push-oxnknwkznumv"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?