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/tools/qdbuscpp2xml/.prev_CMakeLists.txt | 48 +++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 src/tools/qdbuscpp2xml/.prev_CMakeLists.txt (limited to 'src/tools/qdbuscpp2xml/.prev_CMakeLists.txt') 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 +) -- cgit v1.2.3