From 824c2673a76eca07c62762a9eb2a43309cedfb94 Mon Sep 17 00:00:00 2001 From: Peter Hartmann Date: Wed, 7 May 2025 16:48:41 +0200 Subject: [PATCH] shaders: Use different names for qt6_add_shaders calls (#517) Otherwise it won't work for WAsm. According to the doc: "The name after the project has to be unique for each call." --- cmake/QskBuildFunctions.cmake | 4 ++-- playground/shadows/CMakeLists.txt | 2 +- src/CMakeLists.txt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmake/QskBuildFunctions.cmake b/cmake/QskBuildFunctions.cmake index 5bee0e28..fbf57c07 100644 --- a/cmake/QskBuildFunctions.cmake +++ b/cmake/QskBuildFunctions.cmake @@ -149,7 +149,7 @@ function(qsk_add_example target) endfunction() -function(qsk_add_shaders target) +function(qsk_add_shaders target shader_name) cmake_parse_arguments( arg "" "" "FILES" ${ARGN} ) @@ -160,7 +160,7 @@ function(qsk_add_shaders target) list(APPEND outfiles "${qsbname}.qsb") endforeach() - qt6_add_shaders( ${target} "qskshaders" BATCHABLE PRECOMPILE QUIET + qt6_add_shaders( ${target} ${shader_name} BATCHABLE PRECOMPILE QUIET PREFIX "/qskinny/shaders" ${ARGV} OUTPUTS ${outfiles} ) # pass on OUTPUT_TARGETS to the caller of this function diff --git a/playground/shadows/CMakeLists.txt b/playground/shadows/CMakeLists.txt index 8b779858..9b278286 100644 --- a/playground/shadows/CMakeLists.txt +++ b/playground/shadows/CMakeLists.txt @@ -35,6 +35,6 @@ if (QT_VERSION_MAJOR VERSION_GREATER_EQUAL 6) shaders/arcshadow-vulkan.vert shaders/arcshadow-vulkan.frag ) - qsk_add_shaders( ${target} FILES ${SHADERS} OUTPUT_TARGETS shader_target) + qsk_add_shaders( ${target} "qskArcShaders" FILES ${SHADERS} OUTPUT_TARGETS shader_target) endif() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 2c69fa06..3b587adc 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -510,7 +510,7 @@ else() endif() if (QT_VERSION_MAJOR VERSION_GREATER_EQUAL 6) - qsk_add_shaders( ${target} FILES ${SHADERS} OUTPUT_TARGETS shader_target) + qsk_add_shaders( ${target} "qskshaders" FILES ${SHADERS} OUTPUT_TARGETS shader_target) endif() target_include_directories(${target} PUBLIC