diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-02-08 14:04:17 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-02-08 22:49:41 +0100 |
commit | 1e0539ea51b75d9404ccc9506fcc0cdfa6951307 (patch) | |
tree | b9033bc13a4f4611cf430a92236e9b93c460904e /src/linguist | |
parent | 1f859ca1ac6d337aedde2fe8eed74266416ae0d1 (diff) | |
download | qttools-1e0539ea51b75d9404ccc9506fcc0cdfa6951307.tar.gz |
Remove remains of qmake conversion from CMakeLists.txt files
Pick-to: 6.5
Change-Id: Ic00df7d45246270d724b3b1d1ef9d13d76dcc136
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/linguist')
-rw-r--r-- | src/linguist/CMakeLists.txt | 5 | ||||
-rw-r--r-- | src/linguist/lconvert/CMakeLists.txt | 8 | ||||
-rw-r--r-- | src/linguist/linguist/CMakeLists.txt | 4 | ||||
-rw-r--r-- | src/linguist/lprodump/CMakeLists.txt | 4 | ||||
-rw-r--r-- | src/linguist/lrelease-pro/CMakeLists.txt | 11 | ||||
-rw-r--r-- | src/linguist/lrelease/CMakeLists.txt | 11 | ||||
-rw-r--r-- | src/linguist/lupdate-pro/CMakeLists.txt | 17 | ||||
-rw-r--r-- | src/linguist/lupdate/CMakeLists.txt | 24 |
8 files changed, 8 insertions, 76 deletions
diff --git a/src/linguist/CMakeLists.txt b/src/linguist/CMakeLists.txt index 1e19edbe3..d85254b32 100644 --- a/src/linguist/CMakeLists.txt +++ b/src/linguist/CMakeLists.txt @@ -1,9 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from linguist.pro. - - qt_exclude_tool_directories_from_default_target( linguist ) @@ -21,7 +18,5 @@ if(QT_FEATURE_process AND QT_FEATURE_pushbutton AND QT_FEATURE_toolbutton AND TA add_subdirectory(linguist) endif() -# special case begin # Create a fake module that would emulate the Qt5::LinguistTools CMake Config package qt_internal_add_module(Linguist NO_MODULE_HEADERS HEADER_MODULE) -# special case end diff --git a/src/linguist/lconvert/CMakeLists.txt b/src/linguist/lconvert/CMakeLists.txt index 80ff34087..8f7b03a77 100644 --- a/src/linguist/lconvert/CMakeLists.txt +++ b/src/linguist/lconvert/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from lconvert.pro. - ##################################################################### ## lconvert Tool: ##################################################################### @@ -10,7 +8,7 @@ qt_get_tool_target_name(target_name lconvert) qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "Qt Translation File Converter" - TOOLS_TARGET Linguist # special case + TOOLS_TARGET Linguist SOURCES ../shared/numerus.cpp ../shared/po.cpp @@ -31,7 +29,3 @@ qt_internal_add_tool(${target_name} Qt::CorePrivate ) qt_internal_return_unless_building_tools() - -#### Keys ignored in scope 1:.:.:lconvert.pro:<TRUE>: -# QMAKE_TARGET_DESCRIPTION = "Qt Translation File Converter" -# _OPTION = "host_build" diff --git a/src/linguist/linguist/CMakeLists.txt b/src/linguist/linguist/CMakeLists.txt index b5bd8ccfc..edb6e3ae6 100644 --- a/src/linguist/linguist/CMakeLists.txt +++ b/src/linguist/linguist/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from linguist.pro. - ##################################################################### ## linguist App: ##################################################################### @@ -132,10 +130,8 @@ set_target_properties(linguist PROPERTIES QT_TARGET_DESCRIPTION "Qt Linguist" ) -# special case begin file(GLOB phrasebooks_files "${CMAKE_CURRENT_SOURCE_DIR}/../phrasebooks/*") qt_install(FILES ${phrasebooks_files} DESTINATION "${INSTALL_DATADIR}/phrasebooks") -# special case end qt_internal_extend_target(linguist CONDITION QT_PRODUCT___contains___OpenSource._x_ DEFINES diff --git a/src/linguist/lprodump/CMakeLists.txt b/src/linguist/lprodump/CMakeLists.txt index ad4e5fd82..7a7308e54 100644 --- a/src/linguist/lprodump/CMakeLists.txt +++ b/src/linguist/lprodump/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from lprodump.pro. - ##################################################################### ## lprodump Tool: ##################################################################### @@ -10,7 +8,7 @@ qt_get_tool_target_name(target_name lprodump) qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "Qt Linguist QMake Project Dump Tool" - TOOLS_TARGET Linguist # special case + TOOLS_TARGET Linguist INSTALL_DIR "${INSTALL_LIBEXECDIR}" SOURCES ../shared/ioutils.cpp ../shared/ioutils.h diff --git a/src/linguist/lrelease-pro/CMakeLists.txt b/src/linguist/lrelease-pro/CMakeLists.txt index ec6af293b..437e26381 100644 --- a/src/linguist/lrelease-pro/CMakeLists.txt +++ b/src/linguist/lrelease-pro/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from lrelease-pro.pro. - ##################################################################### ## lrelease-pro Tool: ##################################################################### @@ -10,7 +8,7 @@ qt_get_tool_target_name(target_name lrelease-pro) qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "Qt Translation File Compiler for QMake Projects" - TOOLS_TARGET Linguist # special case + TOOLS_TARGET Linguist INSTALL_DIR "${INSTALL_LIBEXECDIR}" SOURCES ../shared/runqttool.cpp ../shared/runqttool.h @@ -22,10 +20,3 @@ qt_internal_add_tool(${target_name} ../shared ) qt_internal_return_unless_building_tools() - -#### Keys ignored in scope 1:.:.:lrelease-pro.pro:<TRUE>: -# QMAKE_TARGET_DESCRIPTION = "Qt Translation File Compiler for QMake Projects" -# QT_TOOL_ENV = "qmake" -# _OPTION = "host_build" -# qmake.name = "QMAKE" -# qmake.value = "$$shell_path($$QMAKE_QMAKE)" diff --git a/src/linguist/lrelease/CMakeLists.txt b/src/linguist/lrelease/CMakeLists.txt index a1f01f840..8d22c2db4 100644 --- a/src/linguist/lrelease/CMakeLists.txt +++ b/src/linguist/lrelease/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from lrelease.pro. - ##################################################################### ## lrelease Tool: ##################################################################### @@ -10,7 +8,7 @@ qt_get_tool_target_name(target_name lrelease) qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "Qt Translation File Compiler" - TOOLS_TARGET Linguist # special case + TOOLS_TARGET Linguist SOURCES ../shared/numerus.cpp ../shared/po.cpp @@ -39,10 +37,3 @@ qt_internal_add_tool(${target_name} # special case end ) qt_internal_return_unless_building_tools() - -#### Keys ignored in scope 1:.:.:lrelease.pro:<TRUE>: -# QMAKE_TARGET_DESCRIPTION = "Qt Translation File Compiler" -# QT_TOOL_ENV = "qmake" -# _OPTION = "host_build" -# qmake.name = "QMAKE" -# qmake.value = "$$shell_path($$QMAKE_QMAKE)" diff --git a/src/linguist/lupdate-pro/CMakeLists.txt b/src/linguist/lupdate-pro/CMakeLists.txt index 0b274b95e..6711d0008 100644 --- a/src/linguist/lupdate-pro/CMakeLists.txt +++ b/src/linguist/lupdate-pro/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from lupdate-pro.pro. - ##################################################################### ## lupdate-pro Tool: ##################################################################### @@ -10,7 +8,7 @@ qt_get_tool_target_name(target_name lupdate-pro) qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "Qt Translation File Update Tool for QMake Projects" - TOOLS_TARGET Linguist # special case + TOOLS_TARGET Linguist INSTALL_DIR "${INSTALL_LIBEXECDIR}" SOURCES ../shared/runqttool.cpp ../shared/runqttool.h @@ -22,16 +20,3 @@ qt_internal_add_tool(${target_name} ../shared ) qt_internal_return_unless_building_tools() - -#### Keys ignored in scope 1:.:.:lupdate-pro.pro:<TRUE>: -# QMAKE_TARGET_DESCRIPTION = "Qt Translation File Update Tool for QMake Projects" -# QT_TOOL_ENV = "qmake" -# _OPTION = "host_build" -# qmake.name = "QMAKE" -# qmake.value = "$$shell_path($$QMAKE_QMAKE)" - -## Scopes: -##################################################################### - -#### Keys ignored in scope 2:.:.:lupdate-pro.pro:MINGW: -# RC_FILE = "lupdate-pro.rc" diff --git a/src/linguist/lupdate/CMakeLists.txt b/src/linguist/lupdate/CMakeLists.txt index b0b723904..0a1214f04 100644 --- a/src/linguist/lupdate/CMakeLists.txt +++ b/src/linguist/lupdate/CMakeLists.txt @@ -1,9 +1,7 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from lupdate.pro. -# special case begin if(CMAKE_VERSION VERSION_LESS "3.19" AND MSVC AND CMAKE_GENERATOR STREQUAL "Ninja Multi-Config") message(WARNING "lupdate will not be built in this configuration.") return() @@ -12,7 +10,6 @@ endif() if (MINGW) set_property(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" PROPERTY _qt_skip_separate_debug_info ON) endif() -# special case end ##################################################################### ## lupdate Tool: @@ -21,7 +18,7 @@ endif() qt_get_tool_target_name(target_name lupdate) qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "Qt Translation File Update Tool" - TOOLS_TARGET Linguist # special case + TOOLS_TARGET Linguist EXTRA_CMAKE_FILES "${CMAKE_CURRENT_LIST_DIR}/../GenerateLUpdateProject.cmake" SOURCES ../shared/numerus.cpp @@ -58,13 +55,6 @@ set_source_files_properties(python.cpp PROPERTIES SKIP_UNITY_BUILD_INCLUSION ON) qt_internal_return_unless_building_tools() -#### Keys ignored in scope 1:.:.:lupdate.pro:<TRUE>: -# QMAKE_TARGET_DESCRIPTION = "Qt Translation File Update Tool" -# QT_TOOL_ENV = "qmake" -# _OPTION = "host_build" -# qmake.name = "QMAKE" -# qmake.value = "$$shell_path($$QMAKE_QMAKE)" - ## Scopes: ##################################################################### @@ -101,21 +91,13 @@ qt_internal_extend_target(${target_name} CONDITION QT_FEATURE_clangcpp LUPDATE_CLANG_VERSION_MINOR=${QT_LIB_CLANG_VERSION_MINOR} LUPDATE_CLANG_VERSION_PATCH=${QT_LIB_CLANG_VERSION_PATCH} # special case end - LIBRARIES # special case - WrapLibClang::WrapLibClang # special case + LIBRARIES + WrapLibClang::WrapLibClang ) qt_internal_extend_target(${target_name} CONDITION MSVC DEFINES _SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING) -# special case begin if(QT_FEATURE_clangcpp) set_property(SOURCE clangtoolastreader.cpp PROPERTY SKIP_AUTOMOC ON) endif() -# special case end - -#### Keys ignored in scope 6:.:.:lupdate.pro:NOT QMAKE_DEFAULT_LIBDIRS___contains____ss_CLANG_LIBDIR AND NOT disable_external_rpath: -# QMAKE_RPATHDIR = "$$CLANG_LIBDIR" - -#### Keys ignored in scope 9:.:.:lupdate.pro:MINGW: -# RC_FILE = "lupdate.rc" |