Browse Source
[cmake] enforce sirit::sirit
Signed-off-by: crueter <crueter@eden-emu.dev>
pull/2655/head
crueter
5 months ago
No known key found for this signature in database
GPG Key ID: 425ACD2D4830EBC6
3 changed files with
10 additions and
11 deletions
-
externals/CMakeLists.txt
-
src/shader_recompiler/CMakeLists.txt
-
src/video_core/CMakeLists.txt
|
|
|
@ -72,15 +72,14 @@ if (YUZU_USE_BUNDLED_SIRIT) |
|
|
|
AddJsonPackage(sirit-ci) |
|
|
|
else() |
|
|
|
AddJsonPackage(sirit) |
|
|
|
endif() |
|
|
|
|
|
|
|
if(MSVC AND USE_CCACHE AND sirit_ADDED) |
|
|
|
if(MSVC AND USE_CCACHE AND sirit_ADDED) |
|
|
|
get_target_property(_opts sirit COMPILE_OPTIONS) |
|
|
|
list(FILTER _opts EXCLUDE REGEX "/Zi") |
|
|
|
list(APPEND _opts "/Z7") |
|
|
|
set_target_properties(sirit PROPERTIES COMPILE_OPTIONS "${_opts}") |
|
|
|
elseif(MSVC AND CXX_CLANG) |
|
|
|
target_compile_options(sirit PRIVATE -Wno-error=unused-command-line-argument) |
|
|
|
set_target_properties(siritobj PROPERTIES COMPILE_OPTIONS "${_opts}") |
|
|
|
elseif(MSVC AND CXX_CLANG) |
|
|
|
target_compile_options(siritobj PRIVATE -Wno-error=unused-command-line-argument) |
|
|
|
endif() |
|
|
|
endif() |
|
|
|
|
|
|
|
# httplib |
|
|
|
|
|
|
|
@ -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) |
|
|
|
target_compile_options(shader_recompiler PRIVATE |
|
|
|
|
|
|
|
@ -333,7 +333,7 @@ target_link_options(video_core PRIVATE ${FFmpeg_LDFLAGS}) |
|
|
|
add_dependencies(video_core host_shaders) |
|
|
|
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 |
|
|
|
target_link_libraries(video_core PUBLIC Vulkan::UtilityHeaders GPUOpen::VulkanMemoryAllocator) |
|
|
|
|
