diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-02-10 18:31:58 +0100 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-02-10 18:35:07 +0100 |
commit | 3af9d49bb78ac56bff57d1c3867853730f97a8e1 (patch) | |
tree | c9d6c1d1fe90dba3c788fd06795cf05a6d4ed5bb /examples/dbus/remotecontrolledcar | |
parent | 71436d5499a9e0355f778f47ef465486a727049d (diff) | |
parent | c431e2d33c2b13dee8b43a08c267c20ec1ae9654 (diff) |
Merge remote-tracking branch 'origin/wip/cmake' into dev
Change-Id: If75ae006db6eb977cf66af4c3d36cb5c8098a1f1
Diffstat (limited to 'examples/dbus/remotecontrolledcar')
4 files changed, 80 insertions, 2 deletions
diff --git a/examples/dbus/remotecontrolledcar/car/.prev_CMakeLists.txt b/examples/dbus/remotecontrolledcar/car/.prev_CMakeLists.txt new file mode 100644 index 0000000000..a028cbcb43 --- /dev/null +++ b/examples/dbus/remotecontrolledcar/car/.prev_CMakeLists.txt @@ -0,0 +1,34 @@ +# Generated from car.pro. + +cmake_minimum_required(VERSION 3.14) +project(car LANGUAGES CXX) + +set(CMAKE_INCLUDE_CURRENT_DIR ON) + +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) +set(CMAKE_AUTOUIC ON) + +set(INSTALL_EXAMPLEDIR "examples/dbus/remotecontrolledcar/car") + +find_package(Qt6 COMPONENTS Core) +find_package(Qt6 COMPONENTS Gui) +find_package(Qt6 COMPONENTS DBus) +find_package(Qt6 COMPONENTS Widgets) + +add_qt_gui_executable(car + car.cpp car.h + main.cpp +) +target_link_libraries(car PUBLIC + Qt::Core + Qt::DBus + Qt::Gui + Qt::Widgets +) + +install(TARGETS car + RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" + BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" +) diff --git a/examples/dbus/remotecontrolledcar/car/CMakeLists.txt b/examples/dbus/remotecontrolledcar/car/CMakeLists.txt index 10abdd8f70..8be7f9ebd1 100644 --- a/examples/dbus/remotecontrolledcar/car/CMakeLists.txt +++ b/examples/dbus/remotecontrolledcar/car/CMakeLists.txt @@ -9,8 +9,10 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/dbus/remotecontrolledcar/car") +find_package(Qt6 COMPONENTS Core) +find_package(Qt6 COMPONENTS Gui) find_package(Qt6 COMPONENTS DBus) find_package(Qt6 COMPONENTS Widgets) @@ -29,9 +31,12 @@ add_qt_gui_executable(car ${car_SRCS} # special case ) target_link_libraries(car PUBLIC + Qt::Core Qt::DBus + Qt::Gui Qt::Widgets ) + install(TARGETS car RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/dbus/remotecontrolledcar/controller/.prev_CMakeLists.txt b/examples/dbus/remotecontrolledcar/controller/.prev_CMakeLists.txt new file mode 100644 index 0000000000..65c32e7c07 --- /dev/null +++ b/examples/dbus/remotecontrolledcar/controller/.prev_CMakeLists.txt @@ -0,0 +1,34 @@ +# Generated from controller.pro. + +cmake_minimum_required(VERSION 3.14) +project(controller LANGUAGES CXX) + +set(CMAKE_INCLUDE_CURRENT_DIR ON) + +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) +set(CMAKE_AUTOUIC ON) + +set(INSTALL_EXAMPLEDIR "examples/dbus/remotecontrolledcar/controller") + +find_package(Qt6 COMPONENTS Core) +find_package(Qt6 COMPONENTS Gui) +find_package(Qt6 COMPONENTS DBus) +find_package(Qt6 COMPONENTS Widgets) + +add_qt_gui_executable(controller + controller.cpp controller.h controller.ui + main.cpp +) +target_link_libraries(controller PUBLIC + Qt::Core + Qt::DBus + Qt::Gui + Qt::Widgets +) + +install(TARGETS controller + RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" + BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" +) diff --git a/examples/dbus/remotecontrolledcar/controller/CMakeLists.txt b/examples/dbus/remotecontrolledcar/controller/CMakeLists.txt index 2075261d18..5ad9d2e51d 100644 --- a/examples/dbus/remotecontrolledcar/controller/CMakeLists.txt +++ b/examples/dbus/remotecontrolledcar/controller/CMakeLists.txt @@ -9,8 +9,10 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/dbus/remotecontrolledcar/controller") +find_package(Qt6 COMPONENTS Core) +find_package(Qt6 COMPONENTS Gui) find_package(Qt6 COMPONENTS DBus) find_package(Qt6 COMPONENTS Widgets) @@ -27,9 +29,12 @@ add_qt_gui_executable(controller ${controller_SRCS} # special case ) target_link_libraries(controller PUBLIC + Qt::Core Qt::DBus + Qt::Gui Qt::Widgets ) + install(TARGETS controller RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" |