4 files changed, 19 insertions, 17 deletions
diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
new file mode 100644
index 0000000..ace7502
--- /dev/null
+++ b/src/tools/CMakeLists.txt
@@ -0,0 +1,3 @@
+if(android_app OR (QT_FEATURE_commandlineparser AND NOT ANDROID))
+    add_subdirectory(canbusutil)
+endif()
diff --git a/src/tools/canbusutil/CMakeLists.txt b/src/tools/canbusutil/CMakeLists.txt
new file mode 100644
index 0000000..ce1d8b0
--- /dev/null
+++ b/src/tools/canbusutil/CMakeLists.txt
@@ -0,0 +1,16 @@
+#####################################################################
+## canbusutil Tool:
+#####################################################################
+
+qt_get_tool_target_name(target_name canbusutil)
+qt_internal_add_tool(${target_name}
+    TARGET_DESCRIPTION "Qt CAN Bus Util"
+    TOOLS_TARGET SerialBus
+    SOURCES
+        canbusutil.cpp canbusutil.h
+        main.cpp
+        readtask.cpp readtask.h
+        sigtermhandler.cpp sigtermhandler.h
+    PUBLIC_LIBRARIES
+        Qt::SerialBus
+)
diff --git a/src/tools/canbusutil/canbusutil.pro b/src/tools/canbusutil/canbusutil.pro
deleted file mode 100644
index b3e0504..0000000
--- a/src/tools/canbusutil/canbusutil.pro
+++ /dev/null
@@ -1,14 +0,0 @@
-QT = core serialbus
-
-SOURCES += main.cpp \
-    readtask.cpp \
-    canbusutil.cpp \
-    sigtermhandler.cpp
-
-HEADERS += \
-    readtask.h \
-    canbusutil.h \
-    sigtermhandler.h
-
-QMAKE_TARGET_DESCRIPTION = "Qt CAN Bus Util"
-load(qt_tool)
diff --git a/src/tools/tools.pro b/src/tools/tools.pro
deleted file mode 100644
index 72d34fb..0000000
--- a/src/tools/tools.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-TEMPLATE = subdirs
-
-qtConfig(commandlineparser):!android|android_app: SUBDIRS += canbusutil