From fc0c1e4576a18f6b46337685da8d73711f7f1598 Mon Sep 17 00:00:00 2001 From: vasilito Date: Thu, 2 Jul 2026 18:38:45 +0300 Subject: [PATCH] qtshadertools(0.2.5): wire ShaderToolsMacros into Config.cmake The cmake-generated Qt6ShaderToolsConfig.cmake has an empty extra_cmake_include list. Patch it to include Qt6ShaderToolsMacros.cmake so qt_internal_add_shaders is defined for downstream modules. --- local/recipes/qt/qtshadertools/recipe.toml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/local/recipes/qt/qtshadertools/recipe.toml b/local/recipes/qt/qtshadertools/recipe.toml index 587f1e2c7a..85a7395fd1 100644 --- a/local/recipes/qt/qtshadertools/recipe.toml +++ b/local/recipes/qt/qtshadertools/recipe.toml @@ -283,6 +283,15 @@ cp -f "${COOKBOOK_SOURCE}/tools/qsb/Qt6ShaderToolsMacros.cmake" \ cp -f "${COOKBOOK_SOURCE}/tools/qsb/Qt6ShaderToolsMacros.cmake" \ "${HOST_BUILD}/lib/cmake/Qt6ShaderTools/Qt6ShaderToolsMacros.cmake" 2>/dev/null || true +QST_CFG="${COOKBOOK_STAGE}/usr/lib/cmake/Qt6ShaderTools/Qt6ShaderToolsConfig.cmake" +if [ -f "${QST_CFG}" ] && ! grep -q "ShaderToolsMacros" "${QST_CFG}"; then + sed -i 's/foreach(extra_cmake_include )/foreach(extra_cmake_include Qt6ShaderToolsMacros.cmake)/' "${QST_CFG}" +fi +QST_CFG_HOST="${HOST_BUILD}/lib/cmake/Qt6ShaderTools/Qt6ShaderToolsConfig.cmake" +if [ -f "${QST_CFG_HOST}" ] && ! grep -q "ShaderToolsMacros" "${QST_CFG_HOST}"; then + sed -i 's/foreach(extra_cmake_include )/foreach(extra_cmake_include Qt6ShaderToolsMacros.cmake)/' "${QST_CFG_HOST}" +fi + for lib in lib/libQt6*.so*; do [ -f "${lib}" ] && cp -an "${lib}" "${COOKBOOK_STAGE}/usr/lib/" done