diff options
Diffstat (limited to 'examples/ivicore/qface-tutorial/chapter5-ipc')
5 files changed, 22 insertions, 23 deletions
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 ) |