diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2024-09-12 13:02:37 +0200 |
|---|---|---|
| committer | Alexey Edelev <alexey.edelev@qt.io> | 2024-09-13 05:01:34 +0000 |
| commit | c04a69fa72b8e6b0f739ac4fea311ca3df39e853 (patch) | |
| tree | bc1fe3d7a451ba2cdd6b49e6b293f1504b61006b | |
| parent | 6334fdd2889a146f62467c274c35fdd4fbb4f17e (diff) | |
Add the wrapping quotes around various path variables
Pick-to: 6.8 dev
Fixes: QTBUG-128420
Fixes: QTBUG-128860
Change-Id: I989f72ba2aba4a284af4e843faeee5bd933f6bf8
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| -rw-r--r-- | src/qml/Qt6QmlMacros.cmake | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/qml/Qt6QmlMacros.cmake b/src/qml/Qt6QmlMacros.cmake index f90c0721f5..434dedd723 100644 --- a/src/qml/Qt6QmlMacros.cmake +++ b/src/qml/Qt6QmlMacros.cmake @@ -1069,10 +1069,10 @@ Check https://doc.qt.io/qt-6/qt-cmake-policy-qtp0001.html for policy details." if("${CMAKE_VERSION}" VERSION_GREATER_EQUAL "3.19.0") set(id qmlaotstats_aggregation) - cmake_language(DEFER DIRECTORY ${PROJECT_BINARY_DIR} GET_CALL ${id} call) + cmake_language(DEFER DIRECTORY "${PROJECT_BINARY_DIR}" GET_CALL ${id} call) if("${call}" STREQUAL "") - cmake_language(EVAL CODE "cmake_language(DEFER DIRECTORY ${PROJECT_BINARY_DIR} " + cmake_language(EVAL CODE "cmake_language(DEFER DIRECTORY \"${PROJECT_BINARY_DIR}\" " "ID ${id} CALL _qt_internal_deferred_aggregate_aotstats_files ${target})") endif() else() @@ -1096,35 +1096,35 @@ function(_qt_internal_deferred_aggregate_aotstats_files target) endforeach() set(aotstats_list_file "${PROJECT_BINARY_DIR}/.rcc/qmlcache/all_aotstats.aotstatslist") - file(WRITE ${aotstats_list_file} ${module_aotstats_files}) + file(WRITE "${aotstats_list_file}" "${module_aotstats_files}") - set(all_aotstats_file ${PROJECT_BINARY_DIR}/.rcc/qmlcache/all_aotstats.aotstats) - set(formatted_stats_file ${PROJECT_BINARY_DIR}/.rcc/qmlcache/all_aotstats.txt) + set(all_aotstats_file "${PROJECT_BINARY_DIR}/.rcc/qmlcache/all_aotstats.aotstats") + set(formatted_stats_file "${PROJECT_BINARY_DIR}/.rcc/qmlcache/all_aotstats.txt") _qt_internal_get_tool_wrapper_script_path(tool_wrapper) add_custom_command( OUTPUT - ${all_aotstats_file} - ${formatted_stats_file} + "${all_aotstats_file}" + "${formatted_stats_file}" DEPENDS ${module_aotstats_targets} COMMAND ${tool_wrapper} $<TARGET_FILE:Qt6::qmlaotstats> aggregate - ${aotstats_list_file} - ${all_aotstats_file} + "${aotstats_list_file}" + "${all_aotstats_file}" COMMAND ${tool_wrapper} $<TARGET_FILE:Qt6::qmlaotstats> format - ${all_aotstats_file} - ${formatted_stats_file} + "${all_aotstats_file}" + "${formatted_stats_file}" ) if(NOT TARGET all_aotstats) add_custom_target(all_aotstats - DEPENDS ${formatted_stats_file} - COMMAND ${CMAKE_COMMAND} -E cat ${formatted_stats_file} + DEPENDS "${formatted_stats_file}" + COMMAND "${CMAKE_COMMAND}" -E cat "${formatted_stats_file}" ) endif() endfunction() |