2 files changed, 66 insertions, 32 deletions
diff --git a/examples/dbus/remotecontrolledcar/car/CMakeLists.txt b/examples/dbus/remotecontrolledcar/car/CMakeLists.txt
index a8aed5413a..9532d0ccee 100644
--- a/examples/dbus/remotecontrolledcar/car/CMakeLists.txt
+++ b/examples/dbus/remotecontrolledcar/car/CMakeLists.txt
@@ -1,19 +1,38 @@
 # Generated from car.pro.
 
-#####################################################################
-## car Binary:
-#####################################################################
+cmake_minimum_required(VERSION 3.14)
+project(car LANGUAGES CXX)
 
-add_qt_executable(car
-    GUI
-    OUTPUT_DIRECTORY "${INSTALL_EXAMPLESDIR}/dbus/remotecontrolledcar/car"
-    INSTALL_DIRECTORY "${INSTALL_EXAMPLESDIR}/dbus/remotecontrolledcar/car"
-    SOURCES
-        car.cpp car.h
-        main.cpp
-    DBUS_ADAPTOR_SOURCES
-        car.xml
-    LIBRARIES
-        Qt::DBus
-        Qt::Widgets
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples")
+
+find_package(Qt5 COMPONENTS DBus)
+find_package(Qt5 COMPONENTS Widgets)
+
+# special case begin
+set(car_SRCS)
+qt5_add_dbus_adaptor(car_SRCS
+    car.xml
+    car.h
+    Car
+    car_adaptor
+)
+# special case end
+add_executable(car WIN32 MACOSX_BUNDLE
+    car.cpp car.h
+    main.cpp
+    ${car_SRCS} # special case
+)
+target_link_libraries(car PUBLIC
+    Qt::DBus
+    Qt::Widgets
+)
+install(TARGETS car
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
 )
diff --git a/examples/dbus/remotecontrolledcar/controller/CMakeLists.txt b/examples/dbus/remotecontrolledcar/controller/CMakeLists.txt
index 3f360fa51b..00bf809392 100644
--- a/examples/dbus/remotecontrolledcar/controller/CMakeLists.txt
+++ b/examples/dbus/remotecontrolledcar/controller/CMakeLists.txt
@@ -1,21 +1,36 @@
 # Generated from controller.pro.
 
-#####################################################################
-## controller Binary:
-#####################################################################
+cmake_minimum_required(VERSION 3.14)
+project(controller LANGUAGES CXX)
 
-add_qt_executable(controller
-    GUI
-    OUTPUT_DIRECTORY "${INSTALL_EXAMPLESDIR}/dbus/remotecontrolledcar/controller"
-    INSTALL_DIRECTORY "${INSTALL_EXAMPLESDIR}/dbus/remotecontrolledcar/controller"
-    SOURCES
-        controller.cpp controller.h controller.ui
-        main.cpp
-    DBUS_INTERFACE_SOURCES
-        car.xml
-    PUBLIC_LIBRARIES
-        Qt::DBus
-        Qt::Widgets
-    ENABLE_AUTOGEN_TOOLS
-        uic
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(INSTALL_EXAMPLEDIR "examples")
+
+find_package(Qt5 COMPONENTS DBus)
+find_package(Qt5 COMPONENTS Widgets)
+
+# special case begin
+set(controller_SRCS)
+qt5_add_dbus_interface(controller_SRCS
+    car.xml
+    car_interface
+)
+# special case end
+add_executable(controller WIN32 MACOSX_BUNDLE
+    controller.cpp controller.h controller.ui
+    main.cpp
+    ${controller_SRCS} # special case
+)
+target_link_libraries(controller PUBLIC
+    Qt::DBus
+    Qt::Widgets
+)
+install(TARGETS controller
+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
 )