From e3f047f1cd4b7e74023bf4521da71015fd0ba36c Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@qt.io>
Date: Tue, 30 Oct 2018 10:29:33 +0100
Subject: [PATCH] Build qdbusxml2cpp and qdbuscpp2xml

Change-Id: Ic14eb1d3608608d00836b216969acb4ed017b678
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
---
 src/CMakeLists.txt                    |  2 +-
 src/tools/CMakeLists.txt              |  4 ++++
 src/tools/qdbuscpp2xml/CMakeLists.txt | 22 ++++++++++++++++++++++
 src/tools/qdbusxml2cpp/CMakeLists.txt |  9 +++++++++
 4 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 src/tools/qdbuscpp2xml/CMakeLists.txt
 create mode 100644 src/tools/qdbusxml2cpp/CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 204d7f67972..fd9016598ea 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -44,10 +44,10 @@ endfunction()
 find_or_build_bootstrap_names()
 
 add_subdirectory(corelib)
-add_subdirectory(tools)
 add_subdirectory(network)
 add_subdirectory(xml)
 add_subdirectory(dbus)
+add_subdirectory(tools)
 if(QT_FEATURE_gui)
     add_subdirectory(gui)
 
diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
index 6c8866b3711..0e4158ca20f 100644
--- a/src/tools/CMakeLists.txt
+++ b/src/tools/CMakeLists.txt
@@ -1,2 +1,6 @@
 add_subdirectory(uic)
+if (QT_FEATURE_dbus)
+    add_subdirectory(qdbuscpp2xml)
+    add_subdirectory(qdbusxml2cpp)
+endif()
 add_subdirectory(qvkgen)
diff --git a/src/tools/qdbuscpp2xml/CMakeLists.txt b/src/tools/qdbuscpp2xml/CMakeLists.txt
new file mode 100644
index 00000000000..58f9b3a9e63
--- /dev/null
+++ b/src/tools/qdbuscpp2xml/CMakeLists.txt
@@ -0,0 +1,22 @@
+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
+        qdbuscpp2xml.cpp
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+        QT_NO_FOREACH
+    INCLUDE_DIRECTORIES
+        ../moc/
+        ../moc/../../3rdparty/tinycbor/src
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::DBusPrivate
+)
diff --git a/src/tools/qdbusxml2cpp/CMakeLists.txt b/src/tools/qdbusxml2cpp/CMakeLists.txt
new file mode 100644
index 00000000000..7db59b48839
--- /dev/null
+++ b/src/tools/qdbusxml2cpp/CMakeLists.txt
@@ -0,0 +1,9 @@
+add_qt_tool(qdbusxml2cpp
+    SOURCES qdbusxml2cpp.cpp
+    DEFINES
+        QT_NO_CAST_FROM_ASCII
+        QT_NO_FOREACH
+    LIBRARIES
+        Qt::CorePrivate
+        Qt::DBusPrivate
+)