diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-12-05 13:40:34 +0100 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-01-24 15:19:26 +0100 |
commit | eac773c8dfd0e2166db53c88f5aa0c1e85933cac (patch) | |
tree | 10fb2ad6b42300172627501837a14588e0b53cf1 /src/linguist | |
parent | 11e62fb056a715075b034a63e248d980bc88b29d (diff) |
CMake: Add Qt6 forward compatible CMake API and targets
Task-number: QTBUG-74137
Task-number: QTBUG-80477
Change-Id: Ib33f27e476bad1cdffda1539c8befaea9070a7e6
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Diffstat (limited to 'src/linguist')
-rw-r--r-- | src/linguist/Qt5LinguistToolsConfig.cmake.in | 11 | ||||
-rw-r--r-- | src/linguist/Qt5LinguistToolsMacros.cmake | 22 |
2 files changed, 33 insertions, 0 deletions
diff --git a/src/linguist/Qt5LinguistToolsConfig.cmake.in b/src/linguist/Qt5LinguistToolsConfig.cmake.in index 4318b16fa..2e99bc762 100644 --- a/src/linguist/Qt5LinguistToolsConfig.cmake.in +++ b/src/linguist/Qt5LinguistToolsConfig.cmake.in @@ -89,4 +89,15 @@ endif() set(Qt5_LRELEASE_EXECUTABLE Qt5::lrelease) set(Qt5_LUPDATE_EXECUTABLE Qt5::lupdate) +# Create versionless tool targets. +foreach(__qt_tool lrelease lupdate lconvert) + if(NOT \"${QT_NO_CREATE_VERSIONLESS_TARGETS}\" AND NOT TARGET Qt::${__qt_tool} + AND TARGET Qt5::${__qt_tool}) + add_executable(Qt::${__qt_tool} IMPORTED) + get_target_property(__qt_imported_location Qt5::${__qt_tool} IMPORTED_LOCATION) + set_target_properties(Qt::${__qt_tool} + PROPERTIES IMPORTED_LOCATION \"${__qt_imported_location}\") + endif() +endforeach() + include(\"${CMAKE_CURRENT_LIST_DIR}/Qt5LinguistToolsMacros.cmake\") diff --git a/src/linguist/Qt5LinguistToolsMacros.cmake b/src/linguist/Qt5LinguistToolsMacros.cmake index 23beeb397..ab271d56a 100644 --- a/src/linguist/Qt5LinguistToolsMacros.cmake +++ b/src/linguist/Qt5LinguistToolsMacros.cmake @@ -81,6 +81,17 @@ function(QT5_CREATE_TRANSLATION _qm_files) set(${_qm_files} ${${_qm_files}} PARENT_SCOPE) endfunction() +if(NOT QT_NO_CREATE_VERSIONLESS_FUNCTIONS) + function(qt_create_translation _qm_files) + if(QT_DEFAULT_MAJOR_VERSION EQUAL 5) + qt5_create_translation("${_qm_files}" ${ARGN}) + elseif(QT_DEFAULT_MAJOR_VERSION EQUAL 6) + qt6_create_translation("${_qm_files}" ${ARGN}) + endif() + set("${_qm_files}" "${${_qm_files}}" PARENT_SCOPE) + endfunction() +endif() + function(QT5_ADD_TRANSLATION _qm_files) set(options) @@ -112,3 +123,14 @@ function(QT5_ADD_TRANSLATION _qm_files) endforeach() set(${_qm_files} ${${_qm_files}} PARENT_SCOPE) endfunction() + +if(NOT QT_NO_CREATE_VERSIONLESS_FUNCTIONS) + function(qt_add_translation _qm_files) + if(QT_DEFAULT_MAJOR_VERSION EQUAL 5) + qt5_add_translation("${_qm_files}" ${ARGN}) + elseif(QT_DEFAULT_MAJOR_VERSION EQUAL 6) + qt6_add_translation("${_qm_files}" ${ARGN}) + endif() + set("${_qm_files}" "${${_qm_files}}" PARENT_SCOPE) + endfunction() +endif() |