summaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorDominik Holland <dominik.holland@qt.io>2021-05-11 14:22:17 +0200
committerDominik Holland <dominik.holland@qt.io>2021-05-20 15:23:38 +0200
commit2d2d4e0cdaec8dbb6e8612f4d408d247ea57f993 (patch)
tree580be7366e716b5eb5e22ccc6059791f1cde1685 /examples
parent3378986c6345587fbc55c9fb6e145bfa511095d3 (diff)
downloadqtivi-2d2d4e0cdaec8dbb6e8612f4d408d247ea57f993.tar.gz
Enable the QtRemoteObjects support
Similar to the previous commits, the examples and tests build ok, but are not yet ready to be used and still need to be refactored. Change-Id: Icb4482696e81a5a17b89622182053c5cfcb5fc7b Reviewed-by: Robert Griebl <robert.griebl@qt.io>
Diffstat (limited to 'examples')
-rw-r--r--examples/ivicore/qface-ivi-remote/backend_qtro/CMakeLists.txt2
-rw-r--r--examples/ivicore/qface-ivi-remote/demo/CMakeLists.txt2
-rw-r--r--examples/ivicore/qface-ivi-remote/frontend/CMakeLists.txt2
-rw-r--r--examples/ivicore/qface-ivi-remote/server_qtro/CMakeLists.txt2
-rw-r--r--examples/ivicore/qface-tutorial/chapter1-basics/frontend/CMakeLists.txt12
-rw-r--r--examples/ivicore/qface-tutorial/chapter1-basics/instrument-cluster/CMakeLists.txt2
-rw-r--r--examples/ivicore/qface-tutorial/chapter2-enums-structs/frontend/CMakeLists.txt12
-rw-r--r--examples/ivicore/qface-tutorial/chapter2-enums-structs/instrument-cluster/CMakeLists.txt2
-rw-r--r--examples/ivicore/qface-tutorial/chapter3-simulation-backend/backend_simulator/CMakeLists.txt14
-rw-r--r--examples/ivicore/qface-tutorial/chapter3-simulation-backend/frontend/CMakeLists.txt12
-rw-r--r--examples/ivicore/qface-tutorial/chapter3-simulation-backend/imports/CMakeLists.txt12
-rw-r--r--examples/ivicore/qface-tutorial/chapter4-simulation-behavior/backend_simulator/CMakeLists.txt16
-rw-r--r--examples/ivicore/qface-tutorial/chapter4-simulation-behavior/frontend/CMakeLists.txt12
-rw-r--r--examples/ivicore/qface-tutorial/chapter4-simulation-behavior/imports/CMakeLists.txt12
-rw-r--r--examples/ivicore/qface-tutorial/chapter5-ipc/backend_qtro/CMakeLists.txt2
-rw-r--r--examples/ivicore/qface-tutorial/chapter5-ipc/backend_simulator/CMakeLists.txt16
-rw-r--r--examples/ivicore/qface-tutorial/chapter5-ipc/frontend/CMakeLists.txt12
-rw-r--r--examples/ivicore/qface-tutorial/chapter5-ipc/imports/CMakeLists.txt12
-rw-r--r--examples/ivicore/qface-tutorial/chapter5-ipc/simulation_server/CMakeLists.txt3
-rw-r--r--examples/ivicore/qface-tutorial/chapter6-own-backend/backend_dbus/CMakeLists.txt2
-rw-r--r--examples/ivicore/qface-tutorial/chapter6-own-backend/backend_simulator/CMakeLists.txt2
-rw-r--r--examples/ivicore/qface-tutorial/chapter6-own-backend/frontend/CMakeLists.txt12
-rw-r--r--examples/ivicore/qface-tutorial/chapter6-own-backend/imports/CMakeLists.txt14
23 files changed, 94 insertions, 95 deletions
diff --git a/examples/ivicore/qface-ivi-remote/backend_qtro/CMakeLists.txt b/examples/ivicore/qface-ivi-remote/backend_qtro/CMakeLists.txt
index f5bda9e..90ec5d8 100644
--- a/examples/ivicore/qface-ivi-remote/backend_qtro/CMakeLists.txt
+++ b/examples/ivicore/qface-ivi-remote/backend_qtro/CMakeLists.txt
@@ -35,7 +35,7 @@ target_include_directories(example_ivi_remote PUBLIC
)
target_link_libraries(example_ivi_remote PUBLIC
- # Remove: L${CMAKE_CURRENT_BINARY_DIR}/../
+ QtIviRemoteExample
Qt::Core
Qt::Gui
Qt::IviCore
diff --git a/examples/ivicore/qface-ivi-remote/demo/CMakeLists.txt b/examples/ivicore/qface-ivi-remote/demo/CMakeLists.txt
index e591f9b..09de96e 100644
--- a/examples/ivicore/qface-ivi-remote/demo/CMakeLists.txt
+++ b/examples/ivicore/qface-ivi-remote/demo/CMakeLists.txt
@@ -36,7 +36,7 @@ target_compile_definitions(qface-ivi-remote PUBLIC
)
target_link_libraries(qface-ivi-remote PUBLIC
- # Remove: L${CMAKE_CURRENT_BINARY_DIR}/../
+ QtIviRemoteExample
Qt::Core
Qt::Gui
Qt::Qml
diff --git a/examples/ivicore/qface-ivi-remote/frontend/CMakeLists.txt b/examples/ivicore/qface-ivi-remote/frontend/CMakeLists.txt
index c219e21..1fb9b77 100644
--- a/examples/ivicore/qface-ivi-remote/frontend/CMakeLists.txt
+++ b/examples/ivicore/qface-ivi-remote/frontend/CMakeLists.txt
@@ -21,7 +21,7 @@ find_package(Qt6 COMPONENTS IviCore)
find_package(Qt6 COMPONENTS Qml)
find_package(Qt6 COMPONENTS Quick)
-qt_add_executable(QtIviRemoteExample)
+add_library(QtIviRemoteExample)
# IVI Generator:
qt6_ivigenerator(QtIviRemoteExample
diff --git a/examples/ivicore/qface-ivi-remote/server_qtro/CMakeLists.txt b/examples/ivicore/qface-ivi-remote/server_qtro/CMakeLists.txt
index 6b2110d..6b29361 100644
--- a/examples/ivicore/qface-ivi-remote/server_qtro/CMakeLists.txt
+++ b/examples/ivicore/qface-ivi-remote/server_qtro/CMakeLists.txt
@@ -40,7 +40,7 @@ target_compile_definitions(qface-ivi-remote-server PUBLIC
)
target_link_libraries(qface-ivi-remote-server PUBLIC
- # Remove: L${CMAKE_CURRENT_BINARY_DIR}/../
+ QtIviRemoteExample
Qt::Core
)
diff --git a/examples/ivicore/qface-tutorial/chapter1-basics/frontend/CMakeLists.txt b/examples/ivicore/qface-tutorial/chapter1-basics/frontend/CMakeLists.txt
index 8457644..37afc5e 100644
--- a/examples/ivicore/qface-tutorial/chapter1-basics/frontend/CMakeLists.txt
+++ b/examples/ivicore/qface-tutorial/chapter1-basics/frontend/CMakeLists.txt
@@ -21,22 +21,22 @@ find_package(Qt6 COMPONENTS IviCore)
find_package(Qt6 COMPONENTS Qml)
find_package(Qt6 COMPONENTS Quick)
-qt_add_executable(QtIviInstrumentCluster)
+add_library(QtIviInstrumentCluster_Chapter1)
# IVI Generator:
-qt6_ivigenerator(QtIviInstrumentCluster
+qt6_ivigenerator(QtIviInstrumentCluster_Chapter1
QFACE_SOURCES ../instrument-cluster.qface
QFACE_FORMAT frontend
)
-set_target_properties(QtIviInstrumentCluster PROPERTIES
+set_target_properties(QtIviInstrumentCluster_Chapter1 PROPERTIES
WIN32_EXECUTABLE TRUE
MACOSX_BUNDLE TRUE
)
-target_compile_definitions(QtIviInstrumentCluster PUBLIC
+target_compile_definitions(QtIviInstrumentCluster_Chapter1 PUBLIC
QT_BUILD_EXAMPLE_IVI_INSTRUMENTCLUSTER_LIB
)
-target_link_libraries(QtIviInstrumentCluster PUBLIC
+target_link_libraries(QtIviInstrumentCluster_Chapter1 PUBLIC
Qt::Core
Qt::Gui
Qt::IviCore
@@ -45,7 +45,7 @@ target_link_libraries(QtIviInstrumentCluster PUBLIC
Qt::Quick
)
-install(TARGETS QtIviInstrumentCluster
+install(TARGETS QtIviInstrumentCluster_Chapter1
RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
diff --git a/examples/ivicore/qface-tutorial/chapter1-basics/instrument-cluster/CMakeLists.txt b/examples/ivicore/qface-tutorial/chapter1-basics/instrument-cluster/CMakeLists.txt
index 3c3e845..f1b9eba 100644
--- a/examples/ivicore/qface-tutorial/chapter1-basics/instrument-cluster/CMakeLists.txt
+++ b/examples/ivicore/qface-tutorial/chapter1-basics/instrument-cluster/CMakeLists.txt
@@ -32,7 +32,7 @@ target_include_directories(chapter1-basics PUBLIC
)
target_link_libraries(chapter1-basics PUBLIC
- # Remove: L${CMAKE_CURRENT_BINARY_DIR}/../
+ QtIviInstrumentCluster_Chapter1
Qt::Core
Qt::Gui
Qt::Qml
diff --git a/examples/ivicore/qface-tutorial/chapter2-enums-structs/frontend/CMakeLists.txt b/examples/ivicore/qface-tutorial/chapter2-enums-structs/frontend/CMakeLists.txt
index e9d0815..39ff7a5 100644
--- a/examples/ivicore/qface-tutorial/chapter2-enums-structs/frontend/CMakeLists.txt
+++ b/examples/ivicore/qface-tutorial/chapter2-enums-structs/frontend/CMakeLists.txt
@@ -21,22 +21,22 @@ find_package(Qt6 COMPONENTS IviCore)
find_package(Qt6 COMPONENTS Qml)
find_package(Qt6 COMPONENTS Quick)
-qt_add_executable(QtIviInstrumentCluster)
+add_library(QtIviInstrumentCluster_Chapter2)
# IVI Generator:
-qt6_ivigenerator(QtIviInstrumentCluster
+qt6_ivigenerator(QtIviInstrumentCluster_Chapter2
QFACE_SOURCES ../instrument-cluster.qface
QFACE_FORMAT frontend
)
-set_target_properties(QtIviInstrumentCluster PROPERTIES
+set_target_properties(QtIviInstrumentCluster_Chapter2 PROPERTIES
WIN32_EXECUTABLE TRUE
MACOSX_BUNDLE TRUE
)
-target_compile_definitions(QtIviInstrumentCluster PUBLIC
+target_compile_definitions(QtIviInstrumentCluster_Chapter2 PUBLIC
QT_BUILD_EXAMPLE_IVI_INSTRUMENTCLUSTER_LIB
)
-target_link_libraries(QtIviInstrumentCluster PUBLIC
+target_link_libraries(QtIviInstrumentCluster_Chapter2 PUBLIC
Qt::Core
Qt::Gui
Qt::IviCore
@@ -45,7 +45,7 @@ target_link_libraries(QtIviInstrumentCluster PUBLIC
Qt::Quick
)
-install(TARGETS QtIviInstrumentCluster
+install(TARGETS QtIviInstrumentCluster_Chapter2
RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
diff --git a/examples/ivicore/qface-tutorial/chapter2-enums-structs/instrument-cluster/CMakeLists.txt b/examples/ivicore/qface-tutorial/chapter2-enums-structs/instrument-cluster/CMakeLists.txt
index 154a9aa..40ea623 100644
--- a/examples/ivicore/qface-tutorial/chapter2-enums-structs/instrument-cluster/CMakeLists.txt
+++ b/examples/ivicore/qface-tutorial/chapter2-enums-structs/instrument-cluster/CMakeLists.txt
@@ -32,7 +32,7 @@ target_include_directories(chapter2-enums-structs PUBLIC
)
target_link_libraries(chapter2-enums-structs PUBLIC
- # Remove: L${CMAKE_CURRENT_BINARY_DIR}/../
+ QtIviInstrumentCluster_Chapter2
Qt::Core
Qt::Gui
Qt::Qml
diff --git a/examples/ivicore/qface-tutorial/chapter3-simulation-backend/backend_simulator/CMakeLists.txt b/examples/ivicore/qface-tutorial/chapter3-simulation-backend/backend_simulator/CMakeLists.txt
index ce270e6..8729060 100644
--- a/examples/ivicore/qface-tutorial/chapter3-simulation-backend/backend_simulator/CMakeLists.txt
+++ b/examples/ivicore/qface-tutorial/chapter3-simulation-backend/backend_simulator/CMakeLists.txt
@@ -19,29 +19,29 @@ find_package(Qt6 COMPONENTS Core)
find_package(Qt6 COMPONENTS Gui)
find_package(Qt6 COMPONENTS IviCore)
-qt_add_plugin(instrumentcluster_simulation)
+qt_add_plugin(instrumentcluster_chapter3_simulation)
# IVI Generator:
-qt6_ivigenerator(instrumentcluster_simulation
+qt6_ivigenerator(instrumentcluster_chapter3_simulation
QFACE_SOURCES ../instrument-cluster.qface
QFACE_FORMAT backend_simulator
)
-set_target_properties(instrumentcluster_simulation PROPERTIES
+set_target_properties(instrumentcluster_chapter3_simulation PROPERTIES
WIN32_EXECUTABLE TRUE
MACOSX_BUNDLE TRUE
)
-target_include_directories(instrumentcluster_simulation PUBLIC
+target_include_directories(instrumentcluster_chapter3_simulation PUBLIC
${CMAKE_CURRENT_BINARY_DIR}/../frontend
)
-target_link_libraries(instrumentcluster_simulation PUBLIC
- # Remove: L${CMAKE_CURRENT_BINARY_DIR}/../
+target_link_libraries(instrumentcluster_chapter3_simulation PUBLIC
+ QtIviInstrumentCluster_Chapter3
Qt::Core
Qt::Gui
Qt::IviCore
)
-install(TARGETS instrumentcluster_simulation
+install(TARGETS instrumentcluster_chapter3_simulation
RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
diff --git a/examples/ivicore/qface-tutorial/chapter3-simulation-backend/frontend/CMakeLists.txt b/examples/ivicore/qface-tutorial/chapter3-simulation-backend/frontend/CMakeLists.txt
index 773b357..0d33a7e 100644
--- a/examples/ivicore/qface-tutorial/chapter3-simulation-backend/frontend/CMakeLists.txt
+++ b/examples/ivicore/qface-tutorial/chapter3-simulation-backend/frontend/CMakeLists.txt
@@ -21,22 +21,22 @@ find_package(Qt6 COMPONENTS IviCore)
find_package(Qt6 COMPONENTS Qml)
find_package(Qt6 COMPONENTS Quick)
-qt_add_executable(QtIviInstrumentCluster)
+add_library(QtIviInstrumentCluster_Chapter3)
# IVI Generator:
-qt6_ivigenerator(QtIviInstrumentCluster
+qt6_ivigenerator(QtIviInstrumentCluster_Chapter3
QFACE_SOURCES ../instrument-cluster.qface
QFACE_FORMAT frontend
)
-set_target_properties(QtIviInstrumentCluster PROPERTIES
+set_target_properties(QtIviInstrumentCluster_Chapter3 PROPERTIES
WIN32_EXECUTABLE TRUE
MACOSX_BUNDLE TRUE
)
-target_compile_definitions(QtIviInstrumentCluster PUBLIC
+target_compile_definitions(QtIviInstrumentCluster_Chapter3 PUBLIC
QT_BUILD_EXAMPLE_IVI_INSTRUMENTCLUSTER_LIB
)
-target_link_libraries(QtIviInstrumentCluster PUBLIC
+target_link_libraries(QtIviInstrumentCluster_Chapter3 PUBLIC
Qt::Core
Qt::Gui
Qt::IviCore
@@ -45,7 +45,7 @@ target_link_libraries(QtIviInstrumentCluster PUBLIC
Qt::Quick
)
-install(TARGETS QtIviInstrumentCluster
+install(TARGETS QtIviInstrumentCluster_Chapter3
RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
diff --git a/examples/ivicore/qface-tutorial/chapter3-simulation-backend/imports/CMakeLists.txt b/examples/ivicore/qface-tutorial/chapter3-simulation-backend/imports/CMakeLists.txt
index 3c35fa0..9232454 100644
--- a/examples/ivicore/qface-tutorial/chapter3-simulation-backend/imports/CMakeLists.txt
+++ b/examples/ivicore/qface-tutorial/chapter3-simulation-backend/imports/CMakeLists.txt
@@ -21,26 +21,26 @@ find_package(Qt6 COMPONENTS IviCore)
# IVI Generator:
-qt6_ivigenerator(instrument_cluster_imports # special case
+qt6_ivigenerator(instrument_cluster_chapter3_imports # special case
QFACE_SOURCES ../instrument-cluster.qface
QFACE_FORMAT qmlplugin
)
-set_target_properties(instrument_cluster_imports PROPERTIES # special case
+set_target_properties(instrument_cluster_chapter3_imports PROPERTIES # special case
WIN32_EXECUTABLE TRUE
MACOSX_BUNDLE TRUE
)
-target_include_directories(instrument_cluster_imports PUBLIC # special case
+target_include_directories(instrument_cluster_chapter3_imports PUBLIC # special case
${CMAKE_CURRENT_BINARY_DIR}/../frontend
)
-target_link_libraries(instrument_cluster_imports PUBLIC # special case
- # Remove: L${CMAKE_CURRENT_BINARY_DIR}/../
+target_link_libraries(instrument_cluster_chapter3_imports PUBLIC # special case
+ QtIviInstrumentCluster_Chapter3
Qt::Core
Qt::Gui
Qt::IviCore
)
-install(TARGETS instrument_cluster_imports # special case
+install(TARGETS instrument_cluster_chapter3_imports # special case
RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
diff --git a/examples/ivicore/qface-tutorial/chapter4-simulation-behavior/backend_simulator/CMakeLists.txt b/examples/ivicore/qface-tutorial/chapter4-simulation-behavior/backend_simulator/CMakeLists.txt
index d05a645..628722a 100644
--- a/examples/ivicore/qface-tutorial/chapter4-simulation-behavior/backend_simulator/CMakeLists.txt
+++ b/examples/ivicore/qface-tutorial/chapter4-simulation-behavior/backend_simulator/CMakeLists.txt
@@ -19,23 +19,23 @@ find_package(Qt6 COMPONENTS Core)
find_package(Qt6 COMPONENTS Gui)
find_package(Qt6 COMPONENTS IviCore)
-qt_add_plugin(instrumentcluster_simulation)
+qt_add_plugin(instrumentcluster_chapter4_simulation)
# IVI Generator:
-qt6_ivigenerator(instrumentcluster_simulation
+qt6_ivigenerator(instrumentcluster_chapter4_simulation
QFACE_SOURCES ../instrument-cluster.qface
QFACE_FORMAT backend_simulator
)
-set_target_properties(instrumentcluster_simulation PROPERTIES
+set_target_properties(instrumentcluster_chapter4_simulation PROPERTIES
WIN32_EXECUTABLE TRUE
MACOSX_BUNDLE TRUE
)
-target_include_directories(instrumentcluster_simulation PUBLIC
+target_include_directories(instrumentcluster_chapter4_simulation PUBLIC
${CMAKE_CURRENT_BINARY_DIR}/../frontend
)
-target_link_libraries(instrumentcluster_simulation PUBLIC
- # Remove: L${CMAKE_CURRENT_BINARY_DIR}/../
+target_link_libraries(instrumentcluster_chapter4_simulation PUBLIC
+ QtIviInstrumentCluster_Chapter4
Qt::Core
Qt::Gui
Qt::IviCore
@@ -47,14 +47,14 @@ set(simulation_resource_files
"simulation.qml"
)
-qt6_add_resources(instrumentcluster_simulation "simulation"
+qt6_add_resources(instrumentcluster_chapter4_simulation "simulation"
PREFIX
"/"
FILES
${simulation_resource_files}
)
-install(TARGETS instrumentcluster_simulation
+install(TARGETS instrumentcluster_chapter4_simulation
RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
diff --git a/examples/ivicore/qface-tutorial/chapter4-simulation-behavior/frontend/CMakeLists.txt b/examples/ivicore/qface-tutorial/chapter4-simulation-behavior/frontend/CMakeLists.txt
index 92b465b..9f4e36a 100644
--- a/examples/ivicore/qface-tutorial/chapter4-simulation-behavior/frontend/CMakeLists.txt
+++ b/examples/ivicore/qface-tutorial/chapter4-simulation-behavior/frontend/CMakeLists.txt
@@ -21,22 +21,22 @@ find_package(Qt6 COMPONENTS IviCore)
find_package(Qt6 COMPONENTS Qml)
find_package(Qt6 COMPONENTS Quick)
-qt_add_executable(QtIviInstrumentCluster)
+add_library(QtIviInstrumentCluster_Chapter4)
# IVI Generator:
-qt6_ivigenerator(QtIviInstrumentCluster
+qt6_ivigenerator(QtIviInstrumentCluster_Chapter4
QFACE_SOURCES ../instrument-cluster.qface
QFACE_FORMAT frontend
)
-set_target_properties(QtIviInstrumentCluster PROPERTIES
+set_target_properties(QtIviInstrumentCluster_Chapter4 PROPERTIES
WIN32_EXECUTABLE TRUE
MACOSX_BUNDLE TRUE
)
-target_compile_definitions(QtIviInstrumentCluster PUBLIC
+target_compile_definitions(QtIviInstrumentCluster_Chapter4 PUBLIC
QT_BUILD_EXAMPLE_IVI_INSTRUMENTCLUSTER_LIB
)
-target_link_libraries(QtIviInstrumentCluster PUBLIC
+target_link_libraries(QtIviInstrumentCluster_Chapter4 PUBLIC
Qt::Core
Qt::Gui
Qt::IviCore
@@ -45,7 +45,7 @@ target_link_libraries(QtIviInstrumentCluster PUBLIC
Qt::Quick
)
-install(TARGETS QtIviInstrumentCluster
+install(TARGETS QtIviInstrumentCluster_Chapter4
RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
diff --git a/examples/ivicore/qface-tutorial/chapter4-simulation-behavior/imports/CMakeLists.txt b/examples/ivicore/qface-tutorial/chapter4-simulation-behavior/imports/CMakeLists.txt
index b55a4e8..8a99af1 100644
--- a/examples/ivicore/qface-tutorial/chapter4-simulation-behavior/imports/CMakeLists.txt
+++ b/examples/ivicore/qface-tutorial/chapter4-simulation-behavior/imports/CMakeLists.txt
@@ -21,26 +21,26 @@ find_package(Qt6 COMPONENTS IviCore)
# IVI Generator:
-qt6_ivigenerator(instrument_cluster_imports # special case
+qt6_ivigenerator(instrument_cluster_chapter4_imports # special case
QFACE_SOURCES ../instrument-cluster.qface
QFACE_FORMAT qmlplugin
)
-set_target_properties(instrument_cluster_imports PROPERTIES # special case
+set_target_properties(instrument_cluster_chapter4_imports PROPERTIES # special case
WIN32_EXECUTABLE TRUE
MACOSX_BUNDLE TRUE
)
-target_include_directories(instrument_cluster_imports PUBLIC # special case
+target_include_directories(instrument_cluster_chapter4_imports PUBLIC # special case
${CMAKE_CURRENT_BINARY_DIR}/../frontend
)
-target_link_libraries(instrument_cluster_imports PUBLIC # special case
- # Remove: L${CMAKE_CURRENT_BINARY_DIR}/../
+target_link_libraries(instrument_cluster_chapter4_imports PUBLIC # special case
+ QtIviInstrumentCluster_Chapter4
Qt::Core
Qt::Gui
Qt::IviCore
)
-install(TARGETS instrument_cluster_imports # special case
+install(TARGETS instrument_cluster_chapter4_imports # special case
RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
diff --git a/examples/ivicore/qface-tutorial/chapter5-ipc/backend_qtro/CMakeLists.txt b/examples/ivicore/qface-tutorial/chapter5-ipc/backend_qtro/CMakeLists.txt
index 6171192..fbf027a 100644
--- a/examples/ivicore/qface-tutorial/chapter5-ipc/backend_qtro/CMakeLists.txt
+++ b/examples/ivicore/qface-tutorial/chapter5-ipc/backend_qtro/CMakeLists.txt
@@ -35,7 +35,7 @@ target_include_directories(instrumentcluster_qtro PUBLIC
)
target_link_libraries(instrumentcluster_qtro PUBLIC
- # Remove: L${CMAKE_CURRENT_BINARY_DIR}/../
+ QtIviInstrumentCluster_Chapter5
Qt::Core
Qt::Gui
Qt::IviCore
diff --git a/examples/ivicore/qface-tutorial/chapter5-ipc/backend_simulator/CMakeLists.txt b/examples/ivicore/qface-tutorial/chapter5-ipc/backend_simulator/CMakeLists.txt
index 6db7b24..c27a530 100644
--- a/examples/ivicore/qface-tutorial/chapter5-ipc/backend_simulator/CMakeLists.txt
+++ b/examples/ivicore/qface-tutorial/chapter5-ipc/backend_simulator/CMakeLists.txt
@@ -19,23 +19,23 @@ find_package(Qt6 COMPONENTS Core)
find_package(Qt6 COMPONENTS Gui)
find_package(Qt6 COMPONENTS IviCore)
-qt_add_plugin(instrumentcluster_simulation)
+qt_add_plugin(instrumentcluster_chapter5_simulation)
# IVI Generator:
-qt6_ivigenerator(instrumentcluster_simulation
+qt6_ivigenerator(instrumentcluster_chapter5_simulation
QFACE_SOURCES ../instrument-cluster.qface
QFACE_FORMAT backend_simulator
)
-set_target_properties(instrumentcluster_simulation PROPERTIES
+set_target_properties(instrumentcluster_chapter5_simulation PROPERTIES
WIN32_EXECUTABLE TRUE
MACOSX_BUNDLE TRUE
)
-target_include_directories(instrumentcluster_simulation PUBLIC
+target_include_directories(instrumentcluster_chapter5_simulation PUBLIC
${CMAKE_CURRENT_BINARY_DIR}/../frontend
)
-target_link_libraries(instrumentcluster_simulation PUBLIC
- # Remove: L${CMAKE_CURRENT_BINARY_DIR}/../
+target_link_libraries(instrumentcluster_chapter5_simulation PUBLIC
+ QtIviInstrumentCluster_Chapter5
Qt::Core
Qt::Gui
Qt::IviCore
@@ -47,14 +47,14 @@ set(simulation_resource_files
"simulation.qml"
)
-qt6_add_resources(instrumentcluster_simulation "simulation"
+qt6_add_resources(instrumentcluster_chapter5_simulation "simulation"
PREFIX
"/"
FILES
${simulation_resource_files}
)
-install(TARGETS instrumentcluster_simulation
+install(TARGETS instrumentcluster_chapter5_simulation
RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
diff --git a/examples/ivicore/qface-tutorial/chapter5-ipc/frontend/CMakeLists.txt b/examples/ivicore/qface-tutorial/chapter5-ipc/frontend/CMakeLists.txt
index 0927186..9be3458 100644
--- a/examples/ivicore/qface-tutorial/chapter5-ipc/frontend/CMakeLists.txt
+++ b/examples/ivicore/qface-tutorial/chapter5-ipc/frontend/CMakeLists.txt
@@ -21,22 +21,22 @@ find_package(Qt6 COMPONENTS IviCore)
find_package(Qt6 COMPONENTS Qml)
find_package(Qt6 COMPONENTS Quick)
-qt_add_executable(QtIviInstrumentCluster)
+add_library(QtIviInstrumentCluster_Chapter5)
# IVI Generator:
-qt6_ivigenerator(QtIviInstrumentCluster
+qt6_ivigenerator(QtIviInstrumentCluster_Chapter5
QFACE_SOURCES ../instrument-cluster.qface
QFACE_FORMAT frontend
)
-set_target_properties(QtIviInstrumentCluster PROPERTIES
+set_target_properties(QtIviInstrumentCluster_Chapter5 PROPERTIES
WIN32_EXECUTABLE TRUE
MACOSX_BUNDLE TRUE
)
-target_compile_definitions(QtIviInstrumentCluster PUBLIC
+target_compile_definitions(QtIviInstrumentCluster_Chapter5 PUBLIC
QT_BUILD_EXAMPLE_IVI_INSTRUMENTCLUSTER_LIB
)
-target_link_libraries(QtIviInstrumentCluster PUBLIC
+target_link_libraries(QtIviInstrumentCluster_Chapter5 PUBLIC
Qt::Core
Qt::Gui
Qt::IviCore
@@ -45,7 +45,7 @@ target_link_libraries(QtIviInstrumentCluster PUBLIC
Qt::Quick
)
-install(TARGETS QtIviInstrumentCluster
+install(TARGETS QtIviInstrumentCluster_Chapter5
RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
diff --git a/examples/ivicore/qface-tutorial/chapter5-ipc/imports/CMakeLists.txt b/examples/ivicore/qface-tutorial/chapter5-ipc/imports/CMakeLists.txt
index 768b549..2e43fb2 100644
--- a/examples/ivicore/qface-tutorial/chapter5-ipc/imports/CMakeLists.txt
+++ b/examples/ivicore/qface-tutorial/chapter5-ipc/imports/CMakeLists.txt
@@ -21,26 +21,26 @@ find_package(Qt6 COMPONENTS IviCore)
# IVI Generator:
-qt6_ivigenerator(imports
+qt6_ivigenerator(instrument_cluster_chapter5_imports
QFACE_SOURCES ../instrument-cluster.qface
QFACE_FORMAT qmlplugin
)
-set_target_properties(imports PROPERTIES
+set_target_properties(instrument_cluster_chapter5_imports PROPERTIES
WIN32_EXECUTABLE TRUE
MACOSX_BUNDLE TRUE
)
-target_include_directories(imports PUBLIC
+target_include_directories(instrument_cluster_chapter5_imports PUBLIC
${CMAKE_CURRENT_BINARY_DIR}/../frontend
)
-target_link_libraries(imports PUBLIC
- # Remove: L${CMAKE_CURRENT_BINARY_DIR}/../
+target_link_libraries(instrument_cluster_chapter5_imports PUBLIC
+ QtIviInstrumentCluster_Chapter5
Qt::Core
Qt::Gui
Qt::IviCore
)
-install(TARGETS imports
+install(TARGETS instrument_cluster_chapter5_imports
RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
diff --git a/examples/ivicore/qface-tutorial/chapter5-ipc/simulation_server/CMakeLists.txt b/examples/ivicore/qface-tutorial/chapter5-ipc/simulation_server/CMakeLists.txt
index 15105dc..e92b615 100644
--- a/examples/ivicore/qface-tutorial/chapter5-ipc/simulation_server/CMakeLists.txt
+++ b/examples/ivicore/qface-tutorial/chapter5-ipc/simulation_server/CMakeLists.txt
@@ -34,8 +34,7 @@ target_include_directories(chapter5-ipc-server PUBLIC
)
target_link_libraries(chapter5-ipc-server PUBLIC
- # Remove: L${CMAKE_CURRENT_BINARY_DIR}/../
- # Remove: gui
+ QtIviInstrumentCluster_Chapter5
Qt::Core
Qt::IviCore
)
diff --git a/examples/ivicore/qface-tutorial/chapter6-own-backend/backend_dbus/CMakeLists.txt b/examples/ivicore/qface-tutorial/chapter6-own-backend/backend_dbus/CMakeLists.txt
index e2b197c..1bf264a 100644
--- a/examples/ivicore/qface-tutorial/chapter6-own-backend/backend_dbus/CMakeLists.txt
+++ b/examples/ivicore/qface-tutorial/chapter6-own-backend/backend_dbus/CMakeLists.txt
@@ -36,7 +36,7 @@ target_include_directories(instrumentcluster_dbus PUBLIC
)
target_link_libraries(instrumentcluster_dbus PUBLIC
- # Remove: L${CMAKE_CURRENT_BINARY_DIR}/../
+ QtIviInstrumentCluster_Chapter6
Qt::Core
Qt::DBus
Qt::Gui
diff --git a/examples/ivicore/qface-tutorial/chapter6-own-backend/backend_simulator/CMakeLists.txt b/examples/ivicore/qface-tutorial/chapter6-own-backend/backend_simulator/CMakeLists.txt
index e3227a0..34bba3b 100644
--- a/examples/ivicore/qface-tutorial/chapter6-own-backend/backend_simulator/CMakeLists.txt
+++ b/examples/ivicore/qface-tutorial/chapter6-own-backend/backend_simulator/CMakeLists.txt
@@ -35,7 +35,7 @@ target_include_directories(instrumentcluster_simulation PUBLIC
)
target_link_libraries(instrumentcluster_simulation PUBLIC
- # Remove: L${CMAKE_CURRENT_BINARY_DIR}/../
+ QtIviInstrumentCluster_Chapter6
Qt::Core
Qt::Gui
Qt::IviCore
diff --git a/examples/ivicore/qface-tutorial/chapter6-own-backend/frontend/CMakeLists.txt b/examples/ivicore/qface-tutorial/chapter6-own-backend/frontend/CMakeLists.txt
index 2b0fc93..4654fff 100644
--- a/examples/ivicore/qface-tutorial/chapter6-own-backend/frontend/CMakeLists.txt
+++ b/examples/ivicore/qface-tutorial/chapter6-own-backend/frontend/CMakeLists.txt
@@ -21,22 +21,22 @@ find_package(Qt6 COMPONENTS IviCore)
find_package(Qt6 COMPONENTS Qml)
find_package(Qt6 COMPONENTS Quick)
-qt_add_executable(QtIviInstrumentCluster)
+add_library(QtIviInstrumentCluster_Chapter6)
# IVI Generator:
-qt6_ivigenerator(QtIviInstrumentCluster
+qt6_ivigenerator(QtIviInstrumentCluster_Chapter6
QFACE_SOURCES ../instrument-cluster.qface
QFACE_FORMAT frontend
)
-set_target_properties(QtIviInstrumentCluster PROPERTIES
+set_target_properties(QtIviInstrumentCluster_Chapter6 PROPERTIES
WIN32_EXECUTABLE TRUE
MACOSX_BUNDLE TRUE
)
-target_compile_definitions(QtIviInstrumentCluster PUBLIC
+target_compile_definitions(QtIviInstrumentCluster_Chapter6 PUBLIC
QT_BUILD_EXAMPLE_IVI_INSTRUMENTCLUSTER_LIB
)
-target_link_libraries(QtIviInstrumentCluster PUBLIC
+target_link_libraries(QtIviInstrumentCluster_Chapter6 PUBLIC
Qt::Core
Qt::Gui
Qt::IviCore
@@ -45,7 +45,7 @@ target_link_libraries(QtIviInstrumentCluster PUBLIC
Qt::Quick
)
-install(TARGETS QtIviInstrumentCluster
+install(TARGETS QtIviInstrumentCluster_Chapter6
RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
diff --git a/examples/ivicore/qface-tutorial/chapter6-own-backend/imports/CMakeLists.txt b/examples/ivicore/qface-tutorial/chapter6-own-backend/imports/CMakeLists.txt
index 9723bd9..fe95de7 100644
--- a/examples/ivicore/qface-tutorial/chapter6-own-backend/imports/CMakeLists.txt
+++ b/examples/ivicore/qface-tutorial/chapter6-own-backend/imports/CMakeLists.txt
@@ -1,7 +1,7 @@
# Generated from imports.pro.
cmake_minimum_required(VERSION 3.14)
-project(imports LANGUAGES CXX)
+project(instrument_cluster_chapter6_imports LANGUAGES CXX)
set(CMAKE_INCLUDE_CURRENT_DIR ON)
@@ -21,26 +21,26 @@ find_package(Qt6 COMPONENTS IviCore)
# IVI Generator:
-qt6_ivigenerator(imports
+qt6_ivigenerator(instrument_cluster_chapter6_imports
QFACE_SOURCES ../instrument-cluster.qface
QFACE_FORMAT qmlplugin
)
-set_target_properties(imports PROPERTIES
+set_target_properties(instrument_cluster_chapter6_imports PROPERTIES
WIN32_EXECUTABLE TRUE
MACOSX_BUNDLE TRUE
)
-target_include_directories(imports PUBLIC
+target_include_directories(instrument_cluster_chapter6_imports PUBLIC
${CMAKE_CURRENT_BINARY_DIR}/../frontend
)
-target_link_libraries(imports PUBLIC
- # Remove: L${CMAKE_CURRENT_BINARY_DIR}/../
+target_link_libraries(instrument_cluster_chapter6_imports PUBLIC
+ QtIviInstrumentCluster_Chapter6
Qt::Core
Qt::Gui
Qt::IviCore
)
-install(TARGETS imports
+install(TARGETS instrument_cluster_chapter6_imports
RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"