diff options
| author | Dominik Holland <dominik.holland@qt.io> | 2024-07-12 15:47:51 +0200 |
|---|---|---|
| committer | Dominik Holland <dominik.holland@qt.io> | 2024-07-15 14:52:33 +0200 |
| commit | f18ce1cc8bfbad42d926f15158acbc0c2bc3fbd8 (patch) | |
| tree | 7513d95ca21a43cf2620266a47f08068e798e6be /examples/interfaceframework/qface-tutorial/ch7-own-template | |
| parent | ace4cd5b479ca4dc4d0f8d1cd278cb2ee49afc4d (diff) | |
Fix rpath and install-location of the qface-tutorial
* Call find_package in the toplevel CMakeLists.txt to make sure the
dbus chapters are loaded if QtDBus is available
* Use qt_standard_project_setup() to setup the default rpath.
* Correctly install the QML modules
Pick-to: 6.8 6.7 6.6 6.5
Task-number: QTBUG-124279
Change-Id: I5f6f020bee2c10a6845de5ba42bb904b502c74fb
Reviewed-by: Robert Griebl <robert.griebl@qt.io>
Diffstat (limited to 'examples/interfaceframework/qface-tutorial/ch7-own-template')
4 files changed, 13 insertions, 5 deletions
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}" ) |