From a48a3e95cfeb29b7823a7de1730bb255a6f462da Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Tue, 8 Oct 2019 09:38:43 +0200 Subject: Clean up tinycbor handling MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Now that pro2cmake handles the include path resolution more like qmake, the tinycbor wrapper target is not needed anymore. Re-generated some CMakeLists.txt to complete that step. Change-Id: I032b2e9bdf9e26f63f3c550d7bca5df93369a82a Reviewed-by: Alexandru Croitor Reviewed-by: Mårten Nordheim Reviewed-by: Qt CMake Build Bot --- src/3rdparty/CMakeLists.txt | 1 - src/3rdparty/tinycbor/CMakeLists.txt | 6 ---- src/corelib/CMakeLists.txt | 2 +- src/tools/moc/.prev_CMakeLists.txt | 33 ++++++++++++++++++++ src/tools/moc/CMakeLists.txt | 14 +++++---- src/tools/qdbuscpp2xml/.prev_CMakeLists.txt | 48 +++++++++++++++++++++++++++++ src/tools/qdbuscpp2xml/CMakeLists.txt | 2 +- 7 files changed, 91 insertions(+), 15 deletions(-) delete mode 100644 src/3rdparty/tinycbor/CMakeLists.txt create mode 100644 src/tools/moc/.prev_CMakeLists.txt create mode 100644 src/tools/qdbuscpp2xml/.prev_CMakeLists.txt diff --git a/src/3rdparty/CMakeLists.txt b/src/3rdparty/CMakeLists.txt index 2d6aed7690..79ff5cd93c 100644 --- a/src/3rdparty/CMakeLists.txt +++ b/src/3rdparty/CMakeLists.txt @@ -1,4 +1,3 @@ -add_subdirectory(tinycbor) add_subdirectory(harfbuzz) add_subdirectory(double-conversion) diff --git a/src/3rdparty/tinycbor/CMakeLists.txt b/src/3rdparty/tinycbor/CMakeLists.txt deleted file mode 100644 index d0c90165bf..0000000000 --- a/src/3rdparty/tinycbor/CMakeLists.txt +++ /dev/null @@ -1,6 +0,0 @@ -add_library(tinycbor INTERFACE) -target_include_directories(tinycbor - INTERFACE - $) - -qt_install_3rdparty_library(tinycbor) diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt index 7e5a3eb083..4155fc5240 100644 --- a/src/corelib/CMakeLists.txt +++ b/src/corelib/CMakeLists.txt @@ -238,6 +238,7 @@ add_qt_module(Core QT_NO_USING_NAMESPACE INCLUDE_DIRECTORIES ${CMAKE_CURRENT_BINARY_DIR}/global # special case + ../3rdparty/tinycbor/src # special case: remove ../3rdparty/... PRECOMPILED_HEADER global/qt_pch.h @@ -249,7 +250,6 @@ add_qt_module(Core Qt::GlobalConfigPrivate # special case QtHarfBuzz # special case Threads::Threads # special case - tinycbor # special case WrapDoubleConversion::WrapDoubleConversion # special case PUBLIC_LIBRARIES # special case: Qt::Platform # special case: diff --git a/src/tools/moc/.prev_CMakeLists.txt b/src/tools/moc/.prev_CMakeLists.txt new file mode 100644 index 0000000000..3889b15a31 --- /dev/null +++ b/src/tools/moc/.prev_CMakeLists.txt @@ -0,0 +1,33 @@ +# Generated from moc.pro. + +##################################################################### +## moc Tool: +##################################################################### + +add_qt_tool(moc + BOOTSTRAP + SOURCES + cbordevice.h + generator.cpp generator.h + moc.cpp moc.h + outputrevision.h + parser.cpp parser.h + preprocessor.cpp preprocessor.h + symbols.h + token.cpp token.h + utils.h + DEFINES + QT_MOC + QT_NO_CAST_FROM_ASCII + QT_NO_CAST_FROM_BYTEARRAY + QT_NO_COMPRESS + QT_NO_FOREACH + INCLUDE_DIRECTORIES + ${CMAKE_CURRENT_SOURCE_DIR} + ../../3rdparty/tinycbor/src +) + +#### Keys ignored in scope 1:.:.:moc.pro:: +# QMAKE_TARGET_DESCRIPTION = "Qt Meta Object Compiler" +# _LOADED = "qt_tool" +# _OPTION = "host_build" diff --git a/src/tools/moc/CMakeLists.txt b/src/tools/moc/CMakeLists.txt index e36cb12ef5..4c65eb9027 100644 --- a/src/tools/moc/CMakeLists.txt +++ b/src/tools/moc/CMakeLists.txt @@ -24,10 +24,12 @@ add_qt_tool(moc QT_NO_CAST_FROM_BYTEARRAY QT_NO_COMPRESS QT_NO_FOREACH - LIBRARIES - tinycbor - # CONFIG = "force_bootstrap" - # QMAKE_TARGET_DESCRIPTION = "Qt Meta Object Compiler" - # _LOADED = "qt_tool" - # _OPTION = "host_build" + INCLUDE_DIRECTORIES + ${CMAKE_CURRENT_SOURCE_DIR} + ../../3rdparty/tinycbor/src ) + +#### Keys ignored in scope 1:.:.:moc.pro:: +# QMAKE_TARGET_DESCRIPTION = "Qt Meta Object Compiler" +# _LOADED = "qt_tool" +# _OPTION = "host_build" diff --git a/src/tools/qdbuscpp2xml/.prev_CMakeLists.txt b/src/tools/qdbuscpp2xml/.prev_CMakeLists.txt new file mode 100644 index 0000000000..5bcc873a43 --- /dev/null +++ b/src/tools/qdbuscpp2xml/.prev_CMakeLists.txt @@ -0,0 +1,48 @@ +# Generated from qdbuscpp2xml.pro. + +##################################################################### +## qdbuscpp2xml Tool: +##################################################################### + +add_qt_tool(qdbuscpp2xml + SOURCES + ../moc/cbordevice.h + ../moc/generator.cpp ../moc/generator.h + ../moc/moc.cpp ../moc/moc.h + ../moc/outputrevision.h + ../moc/parser.cpp ../moc/parser.h + ../moc/preprocessor.cpp ../moc/preprocessor.h + ../moc/symbols.h + ../moc/token.cpp ../moc/token.h + ../moc/utils.h + DEFINES + QT_NO_CAST_FROM_ASCII + QT_NO_FOREACH + INCLUDE_DIRECTORIES + ../moc + ../moc/../../3rdparty/tinycbor/src + LIBRARIES + Qt::CorePrivate +) + +#### Keys ignored in scope 1:.:.:qdbuscpp2xml.pro:: +# QMAKE_TARGET_DESCRIPTION = "Qt D-Bus C++ to XML Compiler" +# _LOADED = "qt_tool" +# _OPTION = "host_build" + +## Scopes: +##################################################################### + +extend_target(qdbuscpp2xml CONDITION force_bootstrap + LIBRARIES + bootstrap_dbusPrivate + PUBLIC_LIBRARIES + bootstrap_dbus +) + +extend_target(qdbuscpp2xml CONDITION NOT force_bootstrap + LIBRARIES + Qt::DBusPrivate + PUBLIC_LIBRARIES + Qt::DBus +) diff --git a/src/tools/qdbuscpp2xml/CMakeLists.txt b/src/tools/qdbuscpp2xml/CMakeLists.txt index d9432e827a..1e02323a4b 100644 --- a/src/tools/qdbuscpp2xml/CMakeLists.txt +++ b/src/tools/qdbuscpp2xml/CMakeLists.txt @@ -22,8 +22,8 @@ add_qt_tool(qdbuscpp2xml QT_NO_FOREACH INCLUDE_DIRECTORIES ../moc + ../moc/../../3rdparty/tinycbor/src LIBRARIES - tinycbor # special case Qt::CorePrivate Qt::DBusPrivate # COMPILE_OPTIONS # special case -- cgit v1.2.3