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 +10 -11
3 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 95b0fac1f9 - Show all commits

17
externals/CMakeLists.txt vendored
View file

@ -72,15 +72,14 @@ if (YUZU_USE_BUNDLED_SIRIT)
AddJsonPackage(sirit-ci) AddJsonPackage(sirit-ci)
else() else()
AddJsonPackage(sirit) AddJsonPackage(sirit)
endif() if(MSVC AND USE_CCACHE AND sirit_ADDED)
get_target_property(_opts sirit COMPILE_OPTIONS)
if(MSVC AND USE_CCACHE AND sirit_ADDED) list(FILTER _opts EXCLUDE REGEX "/Zi")
get_target_property(_opts sirit COMPILE_OPTIONS) list(APPEND _opts "/Z7")
list(FILTER _opts EXCLUDE REGEX "/Zi") set_target_properties(siritobj PROPERTIES COMPILE_OPTIONS "${_opts}")
list(APPEND _opts "/Z7") elseif(MSVC AND CXX_CLANG)
set_target_properties(sirit PROPERTIES COMPILE_OPTIONS "${_opts}") target_compile_options(siritobj PRIVATE -Wno-error=unused-command-line-argument)
elseif(MSVC AND CXX_CLANG) endif()
target_compile_options(sirit PRIVATE -Wno-error=unused-command-line-argument)
endif() endif()
# httplib # httplib

2
src/shader_recompiler/CMakeLists.txt
View file

@ -246,7 +246,7 @@ add_library(shader_recompiler STATIC
) )
target_link_libraries(shader_recompiler PUBLIC common fmt::fmt sirit SPIRV-Tools::SPIRV-Tools) target_link_libraries(shader_recompiler PUBLIC common fmt::fmt sirit::sirit SPIRV-Tools::SPIRV-Tools)
if (MSVC) if (MSVC)
target_compile_options(shader_recompiler PRIVATE target_compile_options(shader_recompiler PRIVATE

2
src/video_core/CMakeLists.txt
View file

@ -333,7 +333,7 @@ target_link_options(video_core PRIVATE ${FFmpeg_LDFLAGS})
add_dependencies(video_core host_shaders) add_dependencies(video_core host_shaders)
target_include_directories(video_core PRIVATE ${HOST_SHADERS_INCLUDE}) target_include_directories(video_core PRIVATE ${HOST_SHADERS_INCLUDE})
target_link_libraries(video_core PRIVATE sirit) target_link_libraries(video_core PRIVATE sirit::sirit)
# Header-only stuff needed by all dependent targets # Header-only stuff needed by all dependent targets
target_link_libraries(video_core PUBLIC Vulkan::UtilityHeaders GPUOpen::VulkanMemoryAllocator) target_link_libraries(video_core PUBLIC Vulkan::UtilityHeaders GPUOpen::VulkanMemoryAllocator)