diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2022-09-14 11:26:16 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-10-28 12:29:02 +0000 |
| commit | 6cd0304e7e01b6bbec6110759b22f3ec79d27e53 (patch) | |
| tree | b4a16e776f1c067bc0a08cb47ffbedcf95953533 | |
| parent | fb2f5784798a96d74eb3c34c78f731c40a312ba6 (diff) | |
| download | qttools-6cd0304e7e01b6bbec6110759b22f3ec79d27e53.tar.gz | |
CMake: Use new _qt_internal_get_tool_wrapper_script_path
Change-Id: Ib1e239b905670852d907f6b9cd088e512c2cbca1
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit b5a285f4c51eb1cede244251d8e010537f2b9a36)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/linguist/Qt6LinguistToolsMacros.cmake | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/src/linguist/Qt6LinguistToolsMacros.cmake b/src/linguist/Qt6LinguistToolsMacros.cmake index 01be40e95..49ee01c07 100644 --- a/src/linguist/Qt6LinguistToolsMacros.cmake +++ b/src/linguist/Qt6LinguistToolsMacros.cmake @@ -196,8 +196,11 @@ set(lupdate_sources \"${sources}\") set(lupdate_translations \"${ts_files}\") ") - _qt_internal_wrap_tool_command(lupdate_command SET - $<TARGET_FILE:${QT_CMAKE_EXPORT_NAMESPACE}::lupdate>) + _qt_internal_get_tool_wrapper_script_path(tool_wrapper) + set(lupdate_command + COMMAND + "${tool_wrapper}" + $<TARGET_FILE:${QT_CMAKE_EXPORT_NAMESPACE}::lupdate>) add_custom_target(${target}_lupdate COMMAND "${CMAKE_COMMAND}" "-DIN_FILE=${lupdate_project_cmake}" "-DOUT_FILE=${lupdate_project_json}" @@ -230,10 +233,15 @@ function(qt6_add_lrelease target) cmake_parse_arguments(arg "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) qt_internal_make_paths_absolute(ts_files "${arg_TS_FILES}") - _qt_internal_wrap_tool_command(lupdate_command SET - $<TARGET_FILE:${QT_CMAKE_EXPORT_NAMESPACE}::lupdate>) - _qt_internal_wrap_tool_command(lrelease_command SET - $<TARGET_FILE:${QT_CMAKE_EXPORT_NAMESPACE}::lrelease>) + _qt_internal_get_tool_wrapper_script_path(tool_wrapper) + set(lupdate_command + COMMAND + "${tool_wrapper}" + $<TARGET_FILE:${QT_CMAKE_EXPORT_NAMESPACE}::lupdate>) + set(lrelease_command + COMMAND + "${tool_wrapper}" + $<TARGET_FILE:${QT_CMAKE_EXPORT_NAMESPACE}::lrelease>) set(qm_files "") foreach(ts_file ${ts_files}) |