diff options
Diffstat (limited to 'examples/ivicore/qface-tutorial/chapter6-own-backend')
4 files changed, 15 insertions, 15 deletions
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}" |