From 08c201070817be73c17fa7e4e790ba08e94532c6 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Thu, 9 Feb 2023 16:46:55 +0100 Subject: src: Remove remains of qmake conversion from CMakeLists.txt files Pick-to: 6.5 Change-Id: Id644d322a602038403bb7f46c532744575fbf6d3 Reviewed-by: Alexey Edelev --- src/tools/androiddeployqt/CMakeLists.txt | 7 +---- src/tools/androidtestrunner/CMakeLists.txt | 5 ---- src/tools/bootstrap/CMakeLists.txt | 38 ++++++++------------------- src/tools/cmake_automoc_parser/CMakeLists.txt | 2 +- src/tools/macdeployqt/CMakeLists.txt | 2 -- src/tools/moc/CMakeLists.txt | 8 +----- src/tools/qdbuscpp2xml/CMakeLists.txt | 21 +-------------- src/tools/qdbusxml2cpp/CMakeLists.txt | 22 +--------------- src/tools/qlalr/CMakeLists.txt | 11 ++------ src/tools/qtpaths/CMakeLists.txt | 2 -- src/tools/qvkgen/CMakeLists.txt | 10 ++----- src/tools/rcc/CMakeLists.txt | 8 +----- src/tools/tracegen/CMakeLists.txt | 7 +---- src/tools/tracepointgen/CMakeLists.txt | 7 +---- src/tools/uic/CMakeLists.txt | 13 +-------- 15 files changed, 24 insertions(+), 139 deletions(-) (limited to 'src/tools') diff --git a/src/tools/androiddeployqt/CMakeLists.txt b/src/tools/androiddeployqt/CMakeLists.txt index b53e541fd0..2a0f1ae9af 100644 --- a/src/tools/androiddeployqt/CMakeLists.txt +++ b/src/tools/androiddeployqt/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from androiddeployqt.pro. - ##################################################################### ## androiddeployqt App: ##################################################################### @@ -20,7 +18,7 @@ qt_internal_add_tool(${target_name} QT_NO_CAST_TO_ASCII QT_NO_FOREACH LIBRARIES - Qt::Core # special case + Qt::Core INCLUDE_DIRECTORIES ../shared ) @@ -29,9 +27,6 @@ set_target_properties(${target_name} PROPERTIES WIN32_EXECUTABLE FALSE ) -#### Keys ignored in scope 1:.:.:androiddeployqt.pro:: -# _OPTION = "host_build" - ## Scopes: ##################################################################### diff --git a/src/tools/androidtestrunner/CMakeLists.txt b/src/tools/androidtestrunner/CMakeLists.txt index c3c6ee476c..77157e29a3 100644 --- a/src/tools/androidtestrunner/CMakeLists.txt +++ b/src/tools/androidtestrunner/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from androidtestrunner.pro. - ##################################################################### ## androidtestrunner App: ##################################################################### @@ -27,9 +25,6 @@ set_target_properties(${target_name} PROPERTIES WIN32_EXECUTABLE FALSE ) -#### Keys ignored in scope 1:.:.:androidtestrunner.pro:: -# _OPTION = "host_build" - ## Scopes: ##################################################################### diff --git a/src/tools/bootstrap/CMakeLists.txt b/src/tools/bootstrap/CMakeLists.txt index 87c5edd90e..232b6fcdfe 100644 --- a/src/tools/bootstrap/CMakeLists.txt +++ b/src/tools/bootstrap/CMakeLists.txt @@ -1,20 +1,16 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from bootstrap.pro. - ##################################################################### ## Bootstrap Module: ##################################################################### -# special case begin # The bootstrap library has a few manual tweaks compared to other # libraries. qt_add_library(Bootstrap STATIC) qt_internal_add_sync_header_dependencies(Bootstrap Core) -# special case end qt_internal_extend_target(Bootstrap SOURCES ../../corelib/global/qassert.cpp @@ -94,12 +90,12 @@ qt_internal_extend_target(Bootstrap DEFINES HAVE_CONFIG_H QT_TYPESAFE_FLAGS - PUBLIC_DEFINES # special case - QT_VERSION_MAJOR=${PROJECT_VERSION_MAJOR} # special case - QT_VERSION_MINOR=${PROJECT_VERSION_MINOR} # special case - QT_VERSION_PATCH=${PROJECT_VERSION_PATCH} # special case - QT_VERSION_STR="${PROJECT_VERSION}" # special case - QT_USE_QSTRINGBUILDER # special case + PUBLIC_DEFINES + QT_VERSION_MAJOR=${PROJECT_VERSION_MAJOR} + QT_VERSION_MINOR=${PROJECT_VERSION_MINOR} + QT_VERSION_PATCH=${PROJECT_VERSION_PATCH} + QT_VERSION_STR="${PROJECT_VERSION}" + QT_USE_QSTRINGBUILDER QT_BOOTSTRAPPED QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII @@ -107,20 +103,13 @@ qt_internal_extend_target(Bootstrap INCLUDE_DIRECTORIES .. ../../3rdparty/tinycbor/src - PUBLIC_INCLUDE_DIRECTORIES # special case - $ # special case + PUBLIC_INCLUDE_DIRECTORIES + $ ../../corelib/global - PUBLIC_LIBRARIES # special case - Qt::Platform # special case + PUBLIC_LIBRARIES + Qt::Platform ) -#### Keys ignored in scope 1:.:.:bootstrap.pro:: -# INSTALLS = "lib" -# MODULE_CONFIG = "gc_binaries" -# MODULE_INCNAME = "QtCore" "QtXml" -# _OPTION = "host_build" -# lib.CONFIG = "dummy_install" - ## Scopes: ##################################################################### @@ -216,7 +205,7 @@ qt_internal_extend_target(Bootstrap CONDITION CMAKE_CROSSCOMPILING OR NOT QT_FEA DEFINES PCRE2_CODE_UNIT_WIDTH=16 PCRE2_DISABLE_JIT - PUBLIC_INCLUDE_DIRECTORIES # special case + PUBLIC_INCLUDE_DIRECTORIES $ ) @@ -235,10 +224,6 @@ qt_internal_extend_target(Bootstrap CONDITION MINGW AND WIN32 uuid ) -#### Keys ignored in scope 22:.:../../3rdparty/pcre2:../../3rdparty/pcre2/pcre2.pri:QT_FEATURE_intelcet: -# QMAKE_CFLAGS = "$$QMAKE_CFLAGS_SHSTK" - -# special case begin target_link_libraries(Bootstrap PRIVATE PlatformCommonInternal) qt_internal_apply_gc_binaries(Bootstrap PUBLIC) set_target_properties(Bootstrap PROPERTIES AUTOMOC OFF AUTOUIC OFF AUTORCC OFF) @@ -259,4 +244,3 @@ if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.20.0" AND QT_FEATURE_debug_and_release set_property(TARGET Bootstrap PROPERTY EXCLUDE_FROM_ALL "$>") endif() -# special case end diff --git a/src/tools/cmake_automoc_parser/CMakeLists.txt b/src/tools/cmake_automoc_parser/CMakeLists.txt index 3b049cd797..5822568877 100644 --- a/src/tools/cmake_automoc_parser/CMakeLists.txt +++ b/src/tools/cmake_automoc_parser/CMakeLists.txt @@ -9,7 +9,7 @@ qt_get_tool_target_name(target_name cmake_automoc_parser) qt_internal_add_tool(${target_name} CORE_LIBRARY Bootstrap INSTALL_DIR "${INSTALL_LIBEXECDIR}" - TOOLS_TARGET Core # special case + TOOLS_TARGET Core SOURCES main.cpp DEFINES diff --git a/src/tools/macdeployqt/CMakeLists.txt b/src/tools/macdeployqt/CMakeLists.txt index 3054926cd3..2e01ec90b4 100644 --- a/src/tools/macdeployqt/CMakeLists.txt +++ b/src/tools/macdeployqt/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from macdeployqt.pro. - if(NOT QT_FEATURE_macdeployqt) return() endif() diff --git a/src/tools/moc/CMakeLists.txt b/src/tools/moc/CMakeLists.txt index c074abaffe..4302992bad 100644 --- a/src/tools/moc/CMakeLists.txt +++ b/src/tools/moc/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from moc.pro. - ##################################################################### ## moc Tool: ##################################################################### @@ -12,7 +10,7 @@ qt_internal_add_tool(${target_name} CORE_LIBRARY Bootstrap TARGET_DESCRIPTION "Qt Meta Object Compiler" INSTALL_DIR "${INSTALL_LIBEXECDIR}" - TOOLS_TARGET Core # special case + TOOLS_TARGET Core SOURCES cbordevice.h collectjson.cpp collectjson.h @@ -38,10 +36,6 @@ qt_internal_add_tool(${target_name} ) qt_internal_return_unless_building_tools() -#### Keys ignored in scope 1:.:.:moc.pro:: -# QMAKE_TARGET_DESCRIPTION = "Qt Meta Object Compiler" -# _OPTION = "host_build" - ## Scopes: ##################################################################### diff --git a/src/tools/qdbuscpp2xml/CMakeLists.txt b/src/tools/qdbuscpp2xml/CMakeLists.txt index deaea21a1f..59677288c7 100644 --- a/src/tools/qdbuscpp2xml/CMakeLists.txt +++ b/src/tools/qdbuscpp2xml/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from qdbuscpp2xml.pro. - ##################################################################### ## qdbuscpp2xml Tool: ##################################################################### @@ -10,7 +8,7 @@ qt_get_tool_target_name(target_name qdbuscpp2xml) qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "Qt D-Bus C++ to XML Compiler" - TOOLS_TARGET DBus # special case + TOOLS_TARGET DBus SOURCES ../moc/cbordevice.h ../moc/collectjson.cpp ../moc/collectjson.h @@ -32,22 +30,5 @@ qt_internal_add_tool(${target_name} LIBRARIES Qt::CorePrivate Qt::DBusPrivate - # COMPILE_OPTIONS # special case - # "$$QT_HOST_CFLAGS_DBUS" - # QMAKE_TARGET_DESCRIPTION = "Qt D-Bus C++ to XML Compiler" - # _LOADED = "qt_tool" - # _OPTION = "host_build" ) qt_internal_return_unless_building_tools() - -#### Keys ignored in scope 1:.:.:qdbuscpp2xml.pro:: -# QMAKE_TARGET_DESCRIPTION = "Qt D-Bus C++ to XML Compiler" -# _OPTION = "host_build" - -## Scopes: -##################################################################### - -# special case begin -# qt_internal_extend_target(qdbuscpp2xml CONDITION force_bootstrap [...]) -# qt_internal_extend_target(qdbuscpp2xml CONDITION NOT force_bootstrap [...]) -# special case end diff --git a/src/tools/qdbusxml2cpp/CMakeLists.txt b/src/tools/qdbusxml2cpp/CMakeLists.txt index b79c8002e8..05acd0329c 100644 --- a/src/tools/qdbusxml2cpp/CMakeLists.txt +++ b/src/tools/qdbusxml2cpp/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from qdbusxml2cpp.pro. - ##################################################################### ## qdbusxml2cpp Tool: ##################################################################### @@ -10,7 +8,7 @@ qt_get_tool_target_name(target_name qdbusxml2cpp) qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "Qt D-Bus XML to C++ Compiler" - TOOLS_TARGET DBus # special case + TOOLS_TARGET DBus SOURCES qdbusxml2cpp.cpp DEFINES @@ -19,23 +17,5 @@ qt_internal_add_tool(${target_name} LIBRARIES Qt::CorePrivate Qt::DBusPrivate - # COMPILE_OPTIONS # special case - # "$$QT_HOST_CFLAGS_DBUS" - # QMAKE_TARGET_DESCRIPTION = "Qt D-Bus XML to C++ Compiler" - # _LOADED = "qt_tool" - # _OPTION = "host_build" ) qt_internal_return_unless_building_tools() - -#### Keys ignored in scope 1:.:.:qdbusxml2cpp.pro:: -# QMAKE_TARGET_DESCRIPTION = "Qt D-Bus XML to C++ Compiler" -# _OPTION = "host_build" - -## Scopes: -##################################################################### - -# special case begin -# qt_internal_extend_target(qdbusxml2cpp CONDITION NOT force_bootstrap [...]) -# qt_internal_extend_target(qdbusxml2cpp CONDITION NOT QT_FEATURE_commandlineparser AND NOT force_bootstrap [...]) -# qt_internal_extend_target(qdbusxml2cpp CONDITION force_bootstrap [...]) -# special case end diff --git a/src/tools/qlalr/CMakeLists.txt b/src/tools/qlalr/CMakeLists.txt index 6d118c560a..003b46417a 100644 --- a/src/tools/qlalr/CMakeLists.txt +++ b/src/tools/qlalr/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from qlalr.pro. - ##################################################################### ## qlalr Tool: ##################################################################### @@ -11,7 +9,7 @@ qt_get_tool_target_name(target_name qlalr) qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "Qt Look Ahead LR Parser Generator" INSTALL_DIR "${INSTALL_LIBEXECDIR}" - TOOLS_TARGET Core # special case + TOOLS_TARGET Core SOURCES compress.cpp compress.h cppgenerator.cpp cppgenerator.h @@ -24,11 +22,6 @@ qt_internal_add_tool(${target_name} DEFINES QT_NO_FOREACH LIBRARIES - Qt::Core # special case + Qt::Core ) qt_internal_return_unless_building_tools() - -#### Keys ignored in scope 1:.:.:qlalr.pro:: -# OTHER_FILES = "lalr.g" -# QMAKE_TARGET_DESCRIPTION = "Qt Look Ahead LR Parser Generator" -# _OPTION = "host_build" diff --git a/src/tools/qtpaths/CMakeLists.txt b/src/tools/qtpaths/CMakeLists.txt index 90613b17d0..eef33c588d 100644 --- a/src/tools/qtpaths/CMakeLists.txt +++ b/src/tools/qtpaths/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from qtpaths.pro. - ##################################################################### ## qtpaths App: ##################################################################### diff --git a/src/tools/qvkgen/CMakeLists.txt b/src/tools/qvkgen/CMakeLists.txt index d694766a7f..0f68968fd3 100644 --- a/src/tools/qvkgen/CMakeLists.txt +++ b/src/tools/qvkgen/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from qvkgen.pro. - ##################################################################### ## qvkgen Tool: ##################################################################### @@ -11,14 +9,10 @@ qt_get_tool_target_name(target_name qvkgen) qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "Qt Vulkan Header Generator" INSTALL_DIR "${INSTALL_LIBEXECDIR}" - TOOLS_TARGET Gui # special case + TOOLS_TARGET Gui SOURCES qvkgen.cpp LIBRARIES - Qt::Core # special case + Qt::Core ) qt_internal_return_unless_building_tools() - -#### Keys ignored in scope 1:.:.:qvkgen.pro:: -# QMAKE_TARGET_DESCRIPTION = "Qt Vulkan Header Generator" -# _OPTION = "host_build" diff --git a/src/tools/rcc/CMakeLists.txt b/src/tools/rcc/CMakeLists.txt index 64eb0b33f5..c810537721 100644 --- a/src/tools/rcc/CMakeLists.txt +++ b/src/tools/rcc/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from rcc.pro. - ##################################################################### ## rcc Tool: ##################################################################### @@ -11,7 +9,7 @@ qt_get_tool_target_name(target_name rcc) qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "Qt Resource Compiler" INSTALL_DIR "${INSTALL_LIBEXECDIR}" - TOOLS_TARGET Core # special case + TOOLS_TARGET Core SOURCES main.cpp rcc.cpp rcc.h @@ -24,10 +22,6 @@ qt_internal_add_tool(${target_name} ) qt_internal_return_unless_building_tools() -#### Keys ignored in scope 1:.:.:rcc.pro:: -# QMAKE_TARGET_DESCRIPTION = "Qt Resource Compiler" -# _OPTION = "host_build" - ## Scopes: ##################################################################### diff --git a/src/tools/tracegen/CMakeLists.txt b/src/tools/tracegen/CMakeLists.txt index 5acf781bf9..2bcdfe42b0 100644 --- a/src/tools/tracegen/CMakeLists.txt +++ b/src/tools/tracegen/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from tracegen.pro. - ##################################################################### ## tracegen Tool: ##################################################################### @@ -11,7 +9,7 @@ qt_get_tool_target_name(target_name tracegen) qt_internal_add_tool(${target_name} CORE_LIBRARY Bootstrap INSTALL_DIR "${INSTALL_LIBEXECDIR}" - TOOLS_TARGET Core # special case + TOOLS_TARGET Core SOURCES etw.cpp etw.h helpers.cpp helpers.h @@ -23,6 +21,3 @@ qt_internal_add_tool(${target_name} tracegen.cpp ) qt_internal_return_unless_building_tools() - -#### Keys ignored in scope 1:.:.:tracegen.pro:: -# _OPTION = "host_build" diff --git a/src/tools/tracepointgen/CMakeLists.txt b/src/tools/tracepointgen/CMakeLists.txt index 17bdcc316b..2f473d376a 100644 --- a/src/tools/tracepointgen/CMakeLists.txt +++ b/src/tools/tracepointgen/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from tracegen.pro. - ##################################################################### ## tracepointgen Tool: ##################################################################### @@ -11,12 +9,9 @@ qt_get_tool_target_name(target_name tracepointgen) qt_internal_add_tool(${target_name} CORE_LIBRARY Bootstrap INSTALL_DIR "${INSTALL_LIBEXECDIR}" - TOOLS_TARGET Core # special case + TOOLS_TARGET Core SOURCES tracepointgen.cpp tracepointgen.h parser.cpp parser.h ) qt_internal_return_unless_building_tools() - -#### Keys ignored in scope 1:.:.:tracegen.pro:: -# _OPTION = "host_build" diff --git a/src/tools/uic/CMakeLists.txt b/src/tools/uic/CMakeLists.txt index fcdfa60939..9f9ea93bea 100644 --- a/src/tools/uic/CMakeLists.txt +++ b/src/tools/uic/CMakeLists.txt @@ -1,8 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: BSD-3-Clause -# Generated from uic.pro. - ##################################################################### ## uic Tool: ##################################################################### @@ -11,7 +9,7 @@ qt_get_tool_target_name(target_name uic) qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "Qt User Interface Compiler" INSTALL_DIR "${INSTALL_LIBEXECDIR}" - TOOLS_TARGET Widgets # special case + TOOLS_TARGET Widgets SOURCES cpp/cppwritedeclaration.cpp cpp/cppwritedeclaration.h cpp/cppwriteincludes.cpp cpp/cppwriteincludes.h @@ -40,14 +38,5 @@ qt_internal_add_tool(${target_name} cpp python shared - #PUBLIC_LIBRARIES # special case remove - #Qt::Gui # special case remove ) qt_internal_return_unless_building_tools() - -#### Keys ignored in scope 1:.:.:uic.pro:: -# QMAKE_TARGET_DESCRIPTION = "Qt User Interface Compiler" -# _OPTION = "host_build" - -## Scopes: -##################################################################### -- cgit v1.2.3