summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@qt.io>2020-11-01 21:37:48 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2020-11-11 16:36:16 +0000
commit6dc0f1f51ab4fbc907650713d8310126ffb0af3a (patch)
tree9d713766cc0e2a2079f698e28970f0546957de4c
parentca9cef2f6a9282cdfbdb8d2c46c4508c6da936bd (diff)
downloadqttools-6dc0f1f51ab4fbc907650713d8310126ffb0af3a.tar.gz
CMake: Fix usage of qt_create_translation in a CTest
Commit 1b006ab3d8954 declared an input file generated by CMake as a BYPRODUCT of the consuming file to fix a policy warning CMP0058. Anyhow, this is technically incorrect, since the file is actually not produced, but consumed by the lupdate command. The incorrect fix also had the side-effect that ninja clean did remove the file, which prevents the use of the macro in CTest. Just remove the BYPRODUCT declaration. The file is written by CMake, so it actually doesn't need neither to be listed in DEPENDENCIES nor in BYPRODUCT. Task-number: QTBUG-71354 Change-Id: I7e5677f2bbd84b8a9fffdcb73465dfae6012ceb5 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 3101eae233f1f5031c5c814d70dedbc7986e7db8) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/linguist/Qt5LinguistToolsMacros.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/linguist/Qt5LinguistToolsMacros.cmake b/src/linguist/Qt5LinguistToolsMacros.cmake
index 2e700bba9..3138aae43 100644
--- a/src/linguist/Qt5LinguistToolsMacros.cmake
+++ b/src/linguist/Qt5LinguistToolsMacros.cmake
@@ -94,7 +94,7 @@ function(QT5_CREATE_TRANSLATION _qm_files)
COMMAND ${Qt5_LUPDATE_EXECUTABLE}
ARGS ${_lupdate_options} "@${_ts_lst_file}" -ts ${_ts_file}
DEPENDS ${_dependencies}
- BYPRODUCTS ${_ts_lst_file} VERBATIM)
+ VERBATIM)
endforeach()
qt5_add_translation(${_qm_files} ${_my_tsfiles})
set(${_qm_files} ${${_qm_files}} PARENT_SCOPE)