diff options
Diffstat (limited to 'examples')
29 files changed, 91 insertions, 30 deletions
diff --git a/examples/interfaceframework/CMakeLists.txt b/examples/interfaceframework/CMakeLists.txt index 60ca1624..492f607a 100644 --- a/examples/interfaceframework/CMakeLists.txt +++ b/examples/interfaceframework/CMakeLists.txt @@ -1,6 +1,3 @@ -cmake_minimum_required(VERSION 3.16) -project(example LANGUAGES CXX) - if(QT_FEATURE_ifcodegen) add_subdirectory(qface-climate) add_subdirectory(qface-addressbook) diff --git a/examples/interfaceframework/qface-addressbook/CMakeLists.txt b/examples/interfaceframework/qface-addressbook/CMakeLists.txt index 68e1a789..2617d661 100644 --- a/examples/interfaceframework/qface-addressbook/CMakeLists.txt +++ b/examples/interfaceframework/qface-addressbook/CMakeLists.txt @@ -1,6 +1,10 @@ cmake_minimum_required(VERSION 3.16) project(example_if_addressbook LANGUAGES CXX) +find_package(Qt6 REQUIRED COMPONENTS Core) + +qt_standard_project_setup() + add_subdirectory(frontend) add_subdirectory(backend_simulator) add_subdirectory(demo) diff --git a/examples/interfaceframework/qface-climate/CMakeLists.txt b/examples/interfaceframework/qface-climate/CMakeLists.txt index b4bc0201..25b6ecf3 100644 --- a/examples/interfaceframework/qface-climate/CMakeLists.txt +++ b/examples/interfaceframework/qface-climate/CMakeLists.txt @@ -1,6 +1,10 @@ cmake_minimum_required(VERSION 3.16) project(example_if_climate LANGUAGES CXX) +find_package(Qt6 REQUIRED COMPONENTS Core) + +qt_standard_project_setup() + add_subdirectory(frontend) add_subdirectory(backend_simulator) add_subdirectory(demo) diff --git a/examples/interfaceframework/qface-remote/CMakeLists.txt b/examples/interfaceframework/qface-remote/CMakeLists.txt index f2d42380..fdfa5b84 100644 --- a/examples/interfaceframework/qface-remote/CMakeLists.txt +++ b/examples/interfaceframework/qface-remote/CMakeLists.txt @@ -1,6 +1,10 @@ cmake_minimum_required(VERSION 3.16) project(example_if_remote LANGUAGES CXX) +find_package(Qt6 REQUIRED COMPONENTS Core) + +qt_standard_project_setup() + add_subdirectory(frontend) add_subdirectory(backend_qtro) add_subdirectory(server_qtro) diff --git a/examples/interfaceframework/qface-remote/server_qtro/CMakeLists.txt b/examples/interfaceframework/qface-remote/server_qtro/CMakeLists.txt index 98611d92..d05c359e 100644 --- a/examples/interfaceframework/qface-remote/server_qtro/CMakeLists.txt +++ b/examples/interfaceframework/qface-remote/server_qtro/CMakeLists.txt @@ -9,7 +9,7 @@ if(NOT DEFINED INSTALL_EXAMPLESDIR) set(INSTALL_EXAMPLESDIR "examples") endif() -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/interfaceframework/qface-remote-server") +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/interfaceframework/qface-remote") find_package(Qt6 REQUIRED COMPONENTS Core InterfaceFramework Qml Quick) diff --git a/examples/interfaceframework/qface-tutorial/CMakeLists.txt b/examples/interfaceframework/qface-tutorial/CMakeLists.txt index aadbffd1..77dc10ae 100644 --- a/examples/interfaceframework/qface-tutorial/CMakeLists.txt +++ b/examples/interfaceframework/qface-tutorial/CMakeLists.txt @@ -1,6 +1,8 @@ cmake_minimum_required(VERSION 3.16) project(qface-tutorial LANGUAGES CXX) +find_package(Qt6 REQUIRED COMPONENTS Core Gui InterfaceFramework) + add_subdirectory(instrument-cluster) add_subdirectory(ch1-basics) add_subdirectory(ch2-enums-structs) diff --git a/examples/interfaceframework/qface-tutorial/ch1-basics/CMakeLists.txt b/examples/interfaceframework/qface-tutorial/ch1-basics/CMakeLists.txt index beb48aa0..a657012f 100644 --- a/examples/interfaceframework/qface-tutorial/ch1-basics/CMakeLists.txt +++ b/examples/interfaceframework/qface-tutorial/ch1-basics/CMakeLists.txt @@ -1,5 +1,9 @@ cmake_minimum_required(VERSION 3.16) project(qface-ch1 LANGUAGES CXX) +find_package(Qt6 REQUIRED COMPONENTS Core) + +qt_standard_project_setup() + add_subdirectory(instrument-cluster) add_subdirectory(frontend) diff --git a/examples/interfaceframework/qface-tutorial/ch2-enums-structs/CMakeLists.txt b/examples/interfaceframework/qface-tutorial/ch2-enums-structs/CMakeLists.txt index d8c351a1..61f2aada 100644 --- a/examples/interfaceframework/qface-tutorial/ch2-enums-structs/CMakeLists.txt +++ b/examples/interfaceframework/qface-tutorial/ch2-enums-structs/CMakeLists.txt @@ -1,5 +1,9 @@ cmake_minimum_required(VERSION 3.16) project(qface-ch2 LANGUAGES CXX) +find_package(Qt6 REQUIRED COMPONENTS Core) + +qt_standard_project_setup() + add_subdirectory(instrument-cluster) add_subdirectory(frontend) diff --git a/examples/interfaceframework/qface-tutorial/ch3-simulation-backend/CMakeLists.txt b/examples/interfaceframework/qface-tutorial/ch3-simulation-backend/CMakeLists.txt index fe490c07..9ca159b1 100644 --- a/examples/interfaceframework/qface-tutorial/ch3-simulation-backend/CMakeLists.txt +++ b/examples/interfaceframework/qface-tutorial/ch3-simulation-backend/CMakeLists.txt @@ -1,6 +1,10 @@ cmake_minimum_required(VERSION 3.16) project(qface-ch3 LANGUAGES CXX) +find_package(Qt6 REQUIRED COMPONENTS Core) + +qt_standard_project_setup() + add_subdirectory(instrument-cluster) add_subdirectory(frontend) add_subdirectory(backend_simulator) diff --git a/examples/interfaceframework/qface-tutorial/ch3-simulation-backend/backend_simulator/CMakeLists.txt b/examples/interfaceframework/qface-tutorial/ch3-simulation-backend/backend_simulator/CMakeLists.txt index 193d1560..4c57ec82 100644 --- a/examples/interfaceframework/qface-tutorial/ch3-simulation-backend/backend_simulator/CMakeLists.txt +++ b/examples/interfaceframework/qface-tutorial/ch3-simulation-backend/backend_simulator/CMakeLists.txt @@ -4,7 +4,7 @@ if(NOT DEFINED INSTALL_EXAMPLESDIR) set(INSTALL_EXAMPLESDIR "examples") endif() -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/interfaceframework/qface-tutorial/ch3-simulation-backend") +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/interfaceframework/qface-tutorial/ch3-simulation-backend/interfaceframework/") find_package(Qt6 REQUIRED COMPONENTS Core Gui InterfaceFramework) diff --git a/examples/interfaceframework/qface-tutorial/ch3-simulation-backend/imports/CMakeLists.txt b/examples/interfaceframework/qface-tutorial/ch3-simulation-backend/imports/CMakeLists.txt index fbd3c9c0..ef0b5698 100644 --- a/examples/interfaceframework/qface-tutorial/ch3-simulation-backend/imports/CMakeLists.txt +++ b/examples/interfaceframework/qface-tutorial/ch3-simulation-backend/imports/CMakeLists.txt @@ -1,4 +1,5 @@ set(CMAKE_AUTOMOC ON) +set(CMAKE_INSTALL_RPATH "$ORIGIN/../../../../") if(NOT DEFINED INSTALL_EXAMPLESDIR) set(INSTALL_EXAMPLESDIR "examples") @@ -33,7 +34,10 @@ target_link_libraries(ic_ch3_imports PUBLIC ) install(TARGETS ic_ch3_imports - RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" - BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" - LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" + RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}/${CLUSTER_URI_PATH}" + BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}/${CLUSTER_URI_PATH}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}/${CLUSTER_URI_PATH}" +) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${CLUSTER_URI_PATH}/qmldir + DESTINATION "${INSTALL_EXAMPLEDIR}/${CLUSTER_URI_PATH}" ) diff --git a/examples/interfaceframework/qface-tutorial/ch4-simulation-behavior/CMakeLists.txt b/examples/interfaceframework/qface-tutorial/ch4-simulation-behavior/CMakeLists.txt index 79e37b1f..cfec24fe 100644 --- a/examples/interfaceframework/qface-tutorial/ch4-simulation-behavior/CMakeLists.txt +++ b/examples/interfaceframework/qface-tutorial/ch4-simulation-behavior/CMakeLists.txt @@ -1,6 +1,10 @@ cmake_minimum_required(VERSION 3.16) project(qface-ch4 LANGUAGES CXX) +find_package(Qt6 REQUIRED COMPONENTS Core) + +qt_standard_project_setup() + add_subdirectory(instrument-cluster) add_subdirectory(frontend) add_subdirectory(backend_simulator) diff --git a/examples/interfaceframework/qface-tutorial/ch4-simulation-behavior/backend_simulator/CMakeLists.txt b/examples/interfaceframework/qface-tutorial/ch4-simulation-behavior/backend_simulator/CMakeLists.txt index 3dd4b536..ffb34ff9 100644 --- a/examples/interfaceframework/qface-tutorial/ch4-simulation-behavior/backend_simulator/CMakeLists.txt +++ b/examples/interfaceframework/qface-tutorial/ch4-simulation-behavior/backend_simulator/CMakeLists.txt @@ -4,7 +4,7 @@ if(NOT DEFINED INSTALL_EXAMPLESDIR) set(INSTALL_EXAMPLESDIR "examples") endif() -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/interfaceframework/qface-tutorial/ch4-simulation-behavior") +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/interfaceframework/qface-tutorial/ch4-simulation-behavior/interfaceframework/") find_package(Qt6 REQUIRED COMPONENTS Core Gui InterfaceFramework) diff --git a/examples/interfaceframework/qface-tutorial/ch4-simulation-behavior/imports/CMakeLists.txt b/examples/interfaceframework/qface-tutorial/ch4-simulation-behavior/imports/CMakeLists.txt index 9345963c..427de152 100644 --- a/examples/interfaceframework/qface-tutorial/ch4-simulation-behavior/imports/CMakeLists.txt +++ b/examples/interfaceframework/qface-tutorial/ch4-simulation-behavior/imports/CMakeLists.txt @@ -1,4 +1,5 @@ set(CMAKE_AUTOMOC ON) +set(CMAKE_INSTALL_RPATH "$ORIGIN/../../../../") if(NOT DEFINED INSTALL_EXAMPLESDIR) set(INSTALL_EXAMPLESDIR "examples") @@ -33,7 +34,10 @@ target_link_libraries(ic_ch4_imports PUBLIC ) install(TARGETS ic_ch4_imports - RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" - BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" - LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" + RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}/${CLUSTER_URI_PATH}" + BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}/${CLUSTER_URI_PATH}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}/${CLUSTER_URI_PATH}" +) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${CLUSTER_URI_PATH}/qmldir + DESTINATION "${INSTALL_EXAMPLEDIR}/${CLUSTER_URI_PATH}" ) diff --git a/examples/interfaceframework/qface-tutorial/ch5-ipc/CMakeLists.txt b/examples/interfaceframework/qface-tutorial/ch5-ipc/CMakeLists.txt index b65b7aa3..e729943f 100644 --- a/examples/interfaceframework/qface-tutorial/ch5-ipc/CMakeLists.txt +++ b/examples/interfaceframework/qface-tutorial/ch5-ipc/CMakeLists.txt @@ -1,6 +1,10 @@ cmake_minimum_required(VERSION 3.16) project(qface-chapter5 LANGUAGES CXX) +find_package(Qt6 REQUIRED COMPONENTS Core) + +qt_standard_project_setup() + add_subdirectory(instrument-cluster) add_subdirectory(frontend) add_subdirectory(backend_simulator) diff --git a/examples/interfaceframework/qface-tutorial/ch5-ipc/backend_qtro/CMakeLists.txt b/examples/interfaceframework/qface-tutorial/ch5-ipc/backend_qtro/CMakeLists.txt index a0b6b6b9..6a5cdec9 100644 --- a/examples/interfaceframework/qface-tutorial/ch5-ipc/backend_qtro/CMakeLists.txt +++ b/examples/interfaceframework/qface-tutorial/ch5-ipc/backend_qtro/CMakeLists.txt @@ -6,7 +6,7 @@ if(NOT DEFINED INSTALL_EXAMPLESDIR) set(INSTALL_EXAMPLESDIR "examples") endif() -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/interfaceframework/qface-tutorial/chapter5-ipc") +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/interfaceframework/qface-tutorial/chapter5-ipc/interfaceframework/") find_package(Qt6 REQUIRED COMPONENTS Core Gui InterfaceFramework) diff --git a/examples/interfaceframework/qface-tutorial/ch5-ipc/backend_simulator/CMakeLists.txt b/examples/interfaceframework/qface-tutorial/ch5-ipc/backend_simulator/CMakeLists.txt index 99e1dd8f..073402ef 100644 --- a/examples/interfaceframework/qface-tutorial/ch5-ipc/backend_simulator/CMakeLists.txt +++ b/examples/interfaceframework/qface-tutorial/ch5-ipc/backend_simulator/CMakeLists.txt @@ -4,7 +4,7 @@ if(NOT DEFINED INSTALL_EXAMPLESDIR) set(INSTALL_EXAMPLESDIR "examples") endif() -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/interfaceframework/qface-tutorial/chapter5-ipc") +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/interfaceframework/qface-tutorial/chapter5-ipc/interfaceframework/") find_package(Qt6 REQUIRED COMPONENTS Core Gui InterfaceFramework) diff --git a/examples/interfaceframework/qface-tutorial/ch5-ipc/imports/CMakeLists.txt b/examples/interfaceframework/qface-tutorial/ch5-ipc/imports/CMakeLists.txt index f50c4bc4..5f56f186 100644 --- a/examples/interfaceframework/qface-tutorial/ch5-ipc/imports/CMakeLists.txt +++ b/examples/interfaceframework/qface-tutorial/ch5-ipc/imports/CMakeLists.txt @@ -1,4 +1,5 @@ set(CMAKE_AUTOMOC ON) +set(CMAKE_INSTALL_RPATH "$ORIGIN/../../../../") if(NOT DEFINED INSTALL_EXAMPLESDIR) set(INSTALL_EXAMPLESDIR "examples") @@ -33,7 +34,10 @@ target_link_libraries(ic_chapter5_imports PUBLIC ) install(TARGETS ic_chapter5_imports - RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" - BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" - LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" + RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}/${CLUSTER_URI_PATH}" + BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}/${CLUSTER_URI_PATH}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}/${CLUSTER_URI_PATH}" +) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${CLUSTER_URI_PATH}/qmldir + DESTINATION "${INSTALL_EXAMPLEDIR}/${CLUSTER_URI_PATH}" ) diff --git a/examples/interfaceframework/qface-tutorial/ch5-ipc/simulation_server/CMakeLists.txt b/examples/interfaceframework/qface-tutorial/ch5-ipc/simulation_server/CMakeLists.txt index 4a91f558..6a2eaa4a 100644 --- a/examples/interfaceframework/qface-tutorial/ch5-ipc/simulation_server/CMakeLists.txt +++ b/examples/interfaceframework/qface-tutorial/ch5-ipc/simulation_server/CMakeLists.txt @@ -6,7 +6,7 @@ if(NOT DEFINED INSTALL_EXAMPLESDIR) set(INSTALL_EXAMPLESDIR "examples") endif() -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/interfaceframework/qface-tutorial/chapter5-ipc/simulation_server") +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/interfaceframework/qface-tutorial/chapter5-ipc") find_package(Qt6 REQUIRED COMPONENTS Core InterfaceFramework Quick) diff --git a/examples/interfaceframework/qface-tutorial/ch6-own-backend/CMakeLists.txt b/examples/interfaceframework/qface-tutorial/ch6-own-backend/CMakeLists.txt index 148d6e8c..58b799b8 100644 --- a/examples/interfaceframework/qface-tutorial/ch6-own-backend/CMakeLists.txt +++ b/examples/interfaceframework/qface-tutorial/ch6-own-backend/CMakeLists.txt @@ -1,6 +1,10 @@ cmake_minimum_required(VERSION 3.16) project(qface-chapter6 LANGUAGES CXX) +find_package(Qt6 REQUIRED COMPONENTS Core) + +qt_standard_project_setup() + add_subdirectory(instrument-cluster) add_subdirectory(frontend) add_subdirectory(backend_simulator) diff --git a/examples/interfaceframework/qface-tutorial/ch6-own-backend/backend_dbus/CMakeLists.txt b/examples/interfaceframework/qface-tutorial/ch6-own-backend/backend_dbus/CMakeLists.txt index 24811ade..9bcbd8e9 100644 --- a/examples/interfaceframework/qface-tutorial/ch6-own-backend/backend_dbus/CMakeLists.txt +++ b/examples/interfaceframework/qface-tutorial/ch6-own-backend/backend_dbus/CMakeLists.txt @@ -6,7 +6,7 @@ if(NOT DEFINED INSTALL_EXAMPLESDIR) set(INSTALL_EXAMPLESDIR "examples") endif() -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/interfaceframework/qface-tutorial/chapter6-own-backend") +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/interfaceframework/qface-tutorial/chapter6-own-backend/interfaceframework/") find_package(Qt6 REQUIRED COMPONENTS Core DBus Gui InterfaceFramework) diff --git a/examples/interfaceframework/qface-tutorial/ch6-own-backend/backend_simulator/CMakeLists.txt b/examples/interfaceframework/qface-tutorial/ch6-own-backend/backend_simulator/CMakeLists.txt index 24f37bdb..ec4d1d87 100644 --- a/examples/interfaceframework/qface-tutorial/ch6-own-backend/backend_simulator/CMakeLists.txt +++ b/examples/interfaceframework/qface-tutorial/ch6-own-backend/backend_simulator/CMakeLists.txt @@ -4,7 +4,7 @@ if(NOT DEFINED INSTALL_EXAMPLESDIR) set(INSTALL_EXAMPLESDIR "examples") endif() -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/interfaceframework/qface-tutorial/chapter6-own-backend") +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/interfaceframework/qface-tutorial/chapter6-own-backend/interfaceframework/") find_package(Qt6 REQUIRED COMPONENTS Core Gui InterfaceFramework) diff --git a/examples/interfaceframework/qface-tutorial/ch6-own-backend/frontend/CMakeLists.txt b/examples/interfaceframework/qface-tutorial/ch6-own-backend/frontend/CMakeLists.txt index 9c043134..93c88060 100644 --- a/examples/interfaceframework/qface-tutorial/ch6-own-backend/frontend/CMakeLists.txt +++ b/examples/interfaceframework/qface-tutorial/ch6-own-backend/frontend/CMakeLists.txt @@ -1,5 +1,3 @@ -cmake_minimum_required(VERSION 3.16) -project(QtIfInstrumentCluster LANGUAGES CXX) set(CMAKE_AUTOMOC ON) diff --git a/examples/interfaceframework/qface-tutorial/ch6-own-backend/imports/CMakeLists.txt b/examples/interfaceframework/qface-tutorial/ch6-own-backend/imports/CMakeLists.txt index 29f93519..0a074226 100644 --- a/examples/interfaceframework/qface-tutorial/ch6-own-backend/imports/CMakeLists.txt +++ b/examples/interfaceframework/qface-tutorial/ch6-own-backend/imports/CMakeLists.txt @@ -1,4 +1,5 @@ set(CMAKE_AUTOMOC ON) +set(CMAKE_INSTALL_RPATH "$ORIGIN/../../../../") if(NOT DEFINED INSTALL_EXAMPLESDIR) set(INSTALL_EXAMPLESDIR "examples") @@ -33,7 +34,10 @@ target_link_libraries(ic_chapter6_imports PUBLIC ) install(TARGETS ic_chapter6_imports - RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" - BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" - LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" + RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}/${CLUSTER_URI_PATH}" + BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}/${CLUSTER_URI_PATH}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}/${CLUSTER_URI_PATH}" +) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${CLUSTER_URI_PATH}/qmldir + DESTINATION "${INSTALL_EXAMPLEDIR}/${CLUSTER_URI_PATH}" ) diff --git a/examples/interfaceframework/qface-tutorial/ch7-own-template/CMakeLists.txt b/examples/interfaceframework/qface-tutorial/ch7-own-template/CMakeLists.txt index 4123a5a0..7f201751 100644 --- a/examples/interfaceframework/qface-tutorial/ch7-own-template/CMakeLists.txt +++ b/examples/interfaceframework/qface-tutorial/ch7-own-template/CMakeLists.txt @@ -1,6 +1,10 @@ cmake_minimum_required(VERSION 3.16) project(qface-chapter7 LANGUAGES CXX) +find_package(Qt6 REQUIRED COMPONENTS Core) + +qt_standard_project_setup() + add_subdirectory(instrument-cluster) add_subdirectory(frontend) add_subdirectory(backend_simulator) diff --git a/examples/interfaceframework/qface-tutorial/ch7-own-template/backend_dbus/CMakeLists.txt b/examples/interfaceframework/qface-tutorial/ch7-own-template/backend_dbus/CMakeLists.txt index 480f4902..e96d3b3e 100644 --- a/examples/interfaceframework/qface-tutorial/ch7-own-template/backend_dbus/CMakeLists.txt +++ b/examples/interfaceframework/qface-tutorial/ch7-own-template/backend_dbus/CMakeLists.txt @@ -6,7 +6,7 @@ if(NOT DEFINED INSTALL_EXAMPLESDIR) set(INSTALL_EXAMPLESDIR "examples") endif() -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/interfaceframework/qface-tutorial/chapter7-own-template") +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/interfaceframework/qface-tutorial/chapter7-own-template/interfaceframework/") find_package(Qt6 REQUIRED COMPONENTS Core DBus Gui InterfaceFramework) diff --git a/examples/interfaceframework/qface-tutorial/ch7-own-template/backend_simulator/CMakeLists.txt b/examples/interfaceframework/qface-tutorial/ch7-own-template/backend_simulator/CMakeLists.txt index 730c8767..924ce63a 100644 --- a/examples/interfaceframework/qface-tutorial/ch7-own-template/backend_simulator/CMakeLists.txt +++ b/examples/interfaceframework/qface-tutorial/ch7-own-template/backend_simulator/CMakeLists.txt @@ -4,7 +4,7 @@ if(NOT DEFINED INSTALL_EXAMPLESDIR) set(INSTALL_EXAMPLESDIR "examples") endif() -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/interfaceframework/qface-tutorial/chapter7-own-template") +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/interfaceframework/qface-tutorial/chapter7-own-template/interfaceframework/") find_package(Qt6 REQUIRED COMPONENTS Core Gui InterfaceFramework) diff --git a/examples/interfaceframework/qface-tutorial/ch7-own-template/imports/CMakeLists.txt b/examples/interfaceframework/qface-tutorial/ch7-own-template/imports/CMakeLists.txt index 9e4f397b..a833ed5b 100644 --- a/examples/interfaceframework/qface-tutorial/ch7-own-template/imports/CMakeLists.txt +++ b/examples/interfaceframework/qface-tutorial/ch7-own-template/imports/CMakeLists.txt @@ -1,4 +1,5 @@ set(CMAKE_AUTOMOC ON) +set(CMAKE_INSTALL_RPATH "$ORIGIN/../../../../") if(NOT DEFINED INSTALL_EXAMPLESDIR) set(INSTALL_EXAMPLESDIR "examples") @@ -33,7 +34,10 @@ target_link_libraries(ic_chapter7_imports PUBLIC ) install(TARGETS ic_chapter7_imports - RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" - BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" - LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" + RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}/${CLUSTER_URI_PATH}" + BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}/${CLUSTER_URI_PATH}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}/${CLUSTER_URI_PATH}" +) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${CLUSTER_URI_PATH}/qmldir + DESTINATION "${INSTALL_EXAMPLEDIR}/${CLUSTER_URI_PATH}" ) diff --git a/examples/interfaceframework/qface-tutorial/instrument-cluster/CMakeLists.txt b/examples/interfaceframework/qface-tutorial/instrument-cluster/CMakeLists.txt index 0fb07825..4d259e18 100644 --- a/examples/interfaceframework/qface-tutorial/instrument-cluster/CMakeLists.txt +++ b/examples/interfaceframework/qface-tutorial/instrument-cluster/CMakeLists.txt @@ -1,6 +1,10 @@ cmake_minimum_required(VERSION 3.16) project(instrument-cluster LANGUAGES CXX) +find_package(Qt6 REQUIRED COMPONENTS Core) + +qt_standard_project_setup() + set(CMAKE_AUTOMOC ON) if(NOT DEFINED INSTALL_EXAMPLESDIR) |