diff options
| author | Alexandru Croitor <[email protected]> | 2025-08-22 12:40:04 +0200 |
|---|---|---|
| committer | Alexandru Croitor <[email protected]> | 2025-08-25 13:53:41 +0200 |
| commit | 106329a2adbc797504102eac1d7f6ef93cc3f941 (patch) | |
| tree | 36bdbb516a17c8f980ef1181b10fc50281d59918 | |
| parent | 8721ff9e83b4f8d50e41cddb0966ff3c6fe54e03 (diff) | |
CMake: Fix execution of svgtoqml tool
It fails in a no-prefix per-repo build of qtdeclarative standalone
examples build, with the following error:
ninja: error:
'examples/quick/quickshapes/weatherforecast/Qt6::svgtoqml', needed by
'examples/quick/quickshapes/weatherforecast/.qt/svgtoqml/Europe_generated.qml',
missing and no known rule to make it
Wrap the command in a <TARGET_FILE> genex, and prepend the tool
wrapper shell script for Windows hosts.
Amends 018b10ff710e75841b02e052f8d851723f555b7b
Change-Id: Ib4aa91f3680cad40ac462a48b09a4acf795ff7ae
Reviewed-by: Alexey Edelev <[email protected]>
| -rw-r--r-- | tools/svgtoqml/Qt6SvgToQmlMacros.cmake | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/svgtoqml/Qt6SvgToQmlMacros.cmake b/tools/svgtoqml/Qt6SvgToQmlMacros.cmake index a981428671..fa60f91692 100644 --- a/tools/svgtoqml/Qt6SvgToQmlMacros.cmake +++ b/tools/svgtoqml/Qt6SvgToQmlMacros.cmake @@ -61,9 +61,13 @@ function(qt6_target_qml_from_svg target) list(APPEND svgtoqml_args "${file_absolute}") list(APPEND svgtoqml_args "${svgtoqml_result}") + _qt_internal_get_tool_wrapper_script_path(tool_wrapper) add_custom_command( OUTPUT "${svgtoqml_result}" - COMMAND ${QT_CMAKE_EXPORT_NAMESPACE}::svgtoqml ${svgtoqml_args} + COMMAND + ${tool_wrapper} + $<TARGET_FILE:${QT_CMAKE_EXPORT_NAMESPACE}::svgtoqml> + ${svgtoqml_args} DEPENDS "${file_absolute}" ${QT_CMAKE_EXPORT_NAMESPACE}::svgtoqml |