diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2019-10-08 09:38:43 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-10-08 09:49:07 +0000 |
| commit | a48a3e95cfeb29b7823a7de1730bb255a6f462da (patch) | |
| tree | 8392b7f15d11f87790e42c9702a2cb19fd069bea /src/tools/moc | |
| parent | d56e627427b9707caa64e10d1214b0adacbc970b (diff) | |
Clean up tinycbor handling
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 <alexandru.croitor@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Qt CMake Build Bot
Diffstat (limited to 'src/tools/moc')
| -rw-r--r-- | src/tools/moc/.prev_CMakeLists.txt | 33 | ||||
| -rw-r--r-- | src/tools/moc/CMakeLists.txt | 14 |
2 files changed, 41 insertions, 6 deletions
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:<TRUE>: +# 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:<TRUE>: +# QMAKE_TARGET_DESCRIPTION = "Qt Meta Object Compiler" +# _LOADED = "qt_tool" +# _OPTION = "host_build" |