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