From 8e3d637e7776638149119bd62f459178cbca2955 Mon Sep 17 00:00:00 2001 From: Dominik Holland Date: Wed, 17 Feb 2021 17:34:35 +0100 Subject: cmake integration of the ivigenerator Rerun pro2cmake.py for all examples and tests. Ivigenerator based tests and examples are compiling fine, but the cmake files need to be reworked to be also able to run them. Task-number: AUTOSUITE-1633 Change-Id: Icb95ecfa62ecb319d042dc30ea9f643b69a4aacf Reviewed-by: Robert Griebl --- examples/CMakeLists.txt | 2 +- .../backend_simulator/CMakeLists.txt | 7 +++ .../qface-ivi-addressbook/demo/CMakeLists.txt | 1 + .../qface-ivi-addressbook/frontend/CMakeLists.txt | 13 ++--- .../backend_simulator/CMakeLists.txt | 7 +++ .../ivicore/qface-ivi-climate/demo/CMakeLists.txt | 1 + .../qface-ivi-climate/frontend/CMakeLists.txt | 13 ++--- .../qface-ivi-remote/backend_qtro/CMakeLists.txt | 6 ++ .../qface-ivi-remote/frontend/CMakeLists.txt | 6 ++ .../qface-ivi-remote/server_qtro/CMakeLists.txt | 6 ++ .../chapter1-basics/frontend/CMakeLists.txt | 6 ++ .../chapter2-enums-structs/frontend/CMakeLists.txt | 6 ++ .../backend_simulator/CMakeLists.txt | 6 ++ .../frontend/CMakeLists.txt | 6 ++ .../imports/CMakeLists.txt | 15 +++-- .../backend_simulator/CMakeLists.txt | 61 ++++++++++++++++++++ .../frontend/CMakeLists.txt | 6 ++ .../imports/CMakeLists.txt | 15 +++-- .../chapter5-ipc/backend_qtro/CMakeLists.txt | 6 ++ .../chapter5-ipc/backend_simulator/CMakeLists.txt | 61 ++++++++++++++++++++ .../chapter5-ipc/frontend/CMakeLists.txt | 6 ++ .../chapter5-ipc/imports/CMakeLists.txt | 5 ++ .../chapter5-ipc/simulation_server/CMakeLists.txt | 65 ++++++++++++++++++++++ .../backend_simulator/CMakeLists.txt | 61 ++++++++++++++++++++ .../chapter6-own-backend/frontend/CMakeLists.txt | 6 ++ .../chapter6-own-backend/imports/CMakeLists.txt | 5 ++ .../climate_widget/CMakeLists.txt | 3 +- 27 files changed, 375 insertions(+), 26 deletions(-) create mode 100644 examples/ivicore/qface-tutorial/chapter4-simulation-behavior/backend_simulator/CMakeLists.txt create mode 100644 examples/ivicore/qface-tutorial/chapter5-ipc/backend_simulator/CMakeLists.txt create mode 100644 examples/ivicore/qface-tutorial/chapter5-ipc/simulation_server/CMakeLists.txt create mode 100644 examples/ivicore/qface-tutorial/chapter6-own-backend/backend_simulator/CMakeLists.txt (limited to 'examples') diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 7e9779d..f703cb6 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -5,7 +5,7 @@ qt_examples_build_begin() if(TARGET Qt::Gui AND TARGET Qt::IviCore) add_subdirectory(ivicore) endif() -if(TARGET Qt::Gui AND TARGET ivivehiclefunctions) +if(TARGET Qt::Gui AND TARGET Qt::IviVehicleFunctions) add_subdirectory(ivivehiclefunctions) endif() if(TARGET Qt::Gui AND TARGET Qt::IviMedia) diff --git a/examples/ivicore/qface-ivi-addressbook/backend_simulator/CMakeLists.txt b/examples/ivicore/qface-ivi-addressbook/backend_simulator/CMakeLists.txt index 11dc7d3..a4b21ce 100644 --- a/examples/ivicore/qface-ivi-addressbook/backend_simulator/CMakeLists.txt +++ b/examples/ivicore/qface-ivi-addressbook/backend_simulator/CMakeLists.txt @@ -19,6 +19,12 @@ find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) find_package(Qt6 COMPONENTS IviCore) +qt_add_plugin(example_ivi_addressbook) + +# IVI Generator: +qt6_ivigenerator(example_ivi_addressbook + QFACE_SOURCES ../example-ivi-addressbook.qface + QFACE_FORMAT backend_simulator ) set_target_properties(example_ivi_addressbook PROPERTIES WIN32_EXECUTABLE TRUE @@ -30,6 +36,7 @@ target_include_directories(example_ivi_addressbook PUBLIC target_link_libraries(example_ivi_addressbook PUBLIC # Remove: L${CMAKE_CURRENT_BINARY_DIR}/../ + QtIviAdressBookExample Qt::Core Qt::Gui Qt::IviCore diff --git a/examples/ivicore/qface-ivi-addressbook/demo/CMakeLists.txt b/examples/ivicore/qface-ivi-addressbook/demo/CMakeLists.txt index f7d36ff..4d4dbad 100644 --- a/examples/ivicore/qface-ivi-addressbook/demo/CMakeLists.txt +++ b/examples/ivicore/qface-ivi-addressbook/demo/CMakeLists.txt @@ -37,6 +37,7 @@ target_compile_definitions(qface-ivi-addressbook PUBLIC target_link_libraries(qface-ivi-addressbook PUBLIC # Remove: L${CMAKE_CURRENT_BINARY_DIR}/../ + QtIviAdressBookExample Qt::Core Qt::Gui Qt::Qml diff --git a/examples/ivicore/qface-ivi-addressbook/frontend/CMakeLists.txt b/examples/ivicore/qface-ivi-addressbook/frontend/CMakeLists.txt index c25aec6..b27c013 100644 --- a/examples/ivicore/qface-ivi-addressbook/frontend/CMakeLists.txt +++ b/examples/ivicore/qface-ivi-addressbook/frontend/CMakeLists.txt @@ -21,13 +21,12 @@ find_package(Qt6 COMPONENTS IviCore) find_package(Qt6 COMPONENTS Qml) find_package(Qt6 COMPONENTS Quick) -) -set_target_properties(QtIviAdressBookExample PROPERTIES - WIN32_EXECUTABLE TRUE - MACOSX_BUNDLE TRUE -) -target_compile_definitions(QtIviAdressBookExample PUBLIC - QT_BUILD_EXAMPLE_IVI_ADDRESSBOOK_LIB +add_library(QtIviAdressBookExample) + +# IVI Generator: +qt6_ivigenerator(QtIviAdressBookExample + QFACE_SOURCES ../example-ivi-addressbook.qface + QFACE_FORMAT frontend ) target_link_libraries(QtIviAdressBookExample PUBLIC diff --git a/examples/ivicore/qface-ivi-climate/backend_simulator/CMakeLists.txt b/examples/ivicore/qface-ivi-climate/backend_simulator/CMakeLists.txt index f5a96df..577ba27 100644 --- a/examples/ivicore/qface-ivi-climate/backend_simulator/CMakeLists.txt +++ b/examples/ivicore/qface-ivi-climate/backend_simulator/CMakeLists.txt @@ -19,6 +19,12 @@ find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) find_package(Qt6 COMPONENTS IviCore) +qt_add_plugin(example_ivi_climate) + +# IVI Generator: +qt6_ivigenerator(example_ivi_climate + QFACE_SOURCES ../example-ivi-climate.qface + QFACE_FORMAT backend_simulator ) set_target_properties(example_ivi_climate PROPERTIES WIN32_EXECUTABLE TRUE @@ -30,6 +36,7 @@ target_include_directories(example_ivi_climate PUBLIC target_link_libraries(example_ivi_climate PUBLIC # Remove: L${CMAKE_CURRENT_BINARY_DIR}/../ + QtIviClimateExample Qt::Core Qt::Gui Qt::IviCore diff --git a/examples/ivicore/qface-ivi-climate/demo/CMakeLists.txt b/examples/ivicore/qface-ivi-climate/demo/CMakeLists.txt index 810725f..8dd6fff 100644 --- a/examples/ivicore/qface-ivi-climate/demo/CMakeLists.txt +++ b/examples/ivicore/qface-ivi-climate/demo/CMakeLists.txt @@ -37,6 +37,7 @@ target_compile_definitions(qface-ivi-climate PUBLIC target_link_libraries(qface-ivi-climate PUBLIC # Remove: L${CMAKE_CURRENT_BINARY_DIR}/../ + QtIviClimateExample Qt::Core Qt::Gui Qt::Qml diff --git a/examples/ivicore/qface-ivi-climate/frontend/CMakeLists.txt b/examples/ivicore/qface-ivi-climate/frontend/CMakeLists.txt index 771443e..9a36218 100644 --- a/examples/ivicore/qface-ivi-climate/frontend/CMakeLists.txt +++ b/examples/ivicore/qface-ivi-climate/frontend/CMakeLists.txt @@ -21,13 +21,12 @@ find_package(Qt6 COMPONENTS IviCore) find_package(Qt6 COMPONENTS Qml) find_package(Qt6 COMPONENTS Quick) -) -set_target_properties(QtIviClimateExample PROPERTIES - WIN32_EXECUTABLE TRUE - MACOSX_BUNDLE TRUE -) -target_compile_definitions(QtIviClimateExample PUBLIC - QT_BUILD_EXAMPLE_IVI_CLIMATE_LIB +add_library(QtIviClimateExample) + +# IVI Generator: +qt6_ivigenerator(QtIviClimateExample + QFACE_SOURCES ../example-ivi-climate.qface + QFACE_FORMAT frontend ) target_link_libraries(QtIviClimateExample PUBLIC diff --git a/examples/ivicore/qface-ivi-remote/backend_qtro/CMakeLists.txt b/examples/ivicore/qface-ivi-remote/backend_qtro/CMakeLists.txt index 26c3d05..f5bda9e 100644 --- a/examples/ivicore/qface-ivi-remote/backend_qtro/CMakeLists.txt +++ b/examples/ivicore/qface-ivi-remote/backend_qtro/CMakeLists.txt @@ -19,6 +19,12 @@ find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) find_package(Qt6 COMPONENTS IviCore) +qt_add_plugin(example_ivi_remote) + +# IVI Generator: +qt6_ivigenerator(example_ivi_remote + QFACE_SOURCES ../example-ivi-remote.qface + QFACE_FORMAT backend_qtro ) set_target_properties(example_ivi_remote PROPERTIES WIN32_EXECUTABLE TRUE diff --git a/examples/ivicore/qface-ivi-remote/frontend/CMakeLists.txt b/examples/ivicore/qface-ivi-remote/frontend/CMakeLists.txt index 10f4cac..c219e21 100644 --- a/examples/ivicore/qface-ivi-remote/frontend/CMakeLists.txt +++ b/examples/ivicore/qface-ivi-remote/frontend/CMakeLists.txt @@ -21,6 +21,12 @@ find_package(Qt6 COMPONENTS IviCore) find_package(Qt6 COMPONENTS Qml) find_package(Qt6 COMPONENTS Quick) +qt_add_executable(QtIviRemoteExample) + +# IVI Generator: +qt6_ivigenerator(QtIviRemoteExample + QFACE_SOURCES ../example-ivi-remote.qface + QFACE_FORMAT frontend ) set_target_properties(QtIviRemoteExample PROPERTIES WIN32_EXECUTABLE TRUE diff --git a/examples/ivicore/qface-ivi-remote/server_qtro/CMakeLists.txt b/examples/ivicore/qface-ivi-remote/server_qtro/CMakeLists.txt index a800ca8..6b2110d 100644 --- a/examples/ivicore/qface-ivi-remote/server_qtro/CMakeLists.txt +++ b/examples/ivicore/qface-ivi-remote/server_qtro/CMakeLists.txt @@ -21,6 +21,12 @@ qt_add_executable(qface-ivi-remote-server main.cpp processingservice.cpp processingservice.h ) + +# IVI Generator: +qt6_ivigenerator(qface-ivi-remote-server + QFACE_SOURCES ../example-ivi-remote.qface + QFACE_FORMAT server_qtro +) set_target_properties(qface-ivi-remote-server PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE FALSE diff --git a/examples/ivicore/qface-tutorial/chapter1-basics/frontend/CMakeLists.txt b/examples/ivicore/qface-tutorial/chapter1-basics/frontend/CMakeLists.txt index fde5846..8457644 100644 --- a/examples/ivicore/qface-tutorial/chapter1-basics/frontend/CMakeLists.txt +++ b/examples/ivicore/qface-tutorial/chapter1-basics/frontend/CMakeLists.txt @@ -21,6 +21,12 @@ find_package(Qt6 COMPONENTS IviCore) find_package(Qt6 COMPONENTS Qml) find_package(Qt6 COMPONENTS Quick) +qt_add_executable(QtIviInstrumentCluster) + +# IVI Generator: +qt6_ivigenerator(QtIviInstrumentCluster + QFACE_SOURCES ../instrument-cluster.qface + QFACE_FORMAT frontend ) set_target_properties(QtIviInstrumentCluster PROPERTIES WIN32_EXECUTABLE TRUE 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 8ca17d5..e9d0815 100644 --- a/examples/ivicore/qface-tutorial/chapter2-enums-structs/frontend/CMakeLists.txt +++ b/examples/ivicore/qface-tutorial/chapter2-enums-structs/frontend/CMakeLists.txt @@ -21,6 +21,12 @@ find_package(Qt6 COMPONENTS IviCore) find_package(Qt6 COMPONENTS Qml) find_package(Qt6 COMPONENTS Quick) +qt_add_executable(QtIviInstrumentCluster) + +# IVI Generator: +qt6_ivigenerator(QtIviInstrumentCluster + QFACE_SOURCES ../instrument-cluster.qface + QFACE_FORMAT frontend ) set_target_properties(QtIviInstrumentCluster PROPERTIES WIN32_EXECUTABLE TRUE 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 9927170..ce270e6 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,6 +19,12 @@ find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) find_package(Qt6 COMPONENTS IviCore) +qt_add_plugin(instrumentcluster_simulation) + +# IVI Generator: +qt6_ivigenerator(instrumentcluster_simulation + QFACE_SOURCES ../instrument-cluster.qface + QFACE_FORMAT backend_simulator ) set_target_properties(instrumentcluster_simulation PROPERTIES WIN32_EXECUTABLE TRUE 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 dc2a4c6..773b357 100644 --- a/examples/ivicore/qface-tutorial/chapter3-simulation-backend/frontend/CMakeLists.txt +++ b/examples/ivicore/qface-tutorial/chapter3-simulation-backend/frontend/CMakeLists.txt @@ -21,6 +21,12 @@ find_package(Qt6 COMPONENTS IviCore) find_package(Qt6 COMPONENTS Qml) find_package(Qt6 COMPONENTS Quick) +qt_add_executable(QtIviInstrumentCluster) + +# IVI Generator: +qt6_ivigenerator(QtIviInstrumentCluster + QFACE_SOURCES ../instrument-cluster.qface + QFACE_FORMAT frontend ) set_target_properties(QtIviInstrumentCluster PROPERTIES WIN32_EXECUTABLE TRUE 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 931e18d..3c35fa0 100644 --- a/examples/ivicore/qface-tutorial/chapter3-simulation-backend/imports/CMakeLists.txt +++ b/examples/ivicore/qface-tutorial/chapter3-simulation-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_imports LANGUAGES CXX) # special case set(CMAKE_INCLUDE_CURRENT_DIR ON) @@ -19,23 +19,28 @@ find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) find_package(Qt6 COMPONENTS IviCore) + +# IVI Generator: +qt6_ivigenerator(instrument_cluster_imports # special case + QFACE_SOURCES ../instrument-cluster.qface + QFACE_FORMAT qmlplugin ) -set_target_properties(imports PROPERTIES +set_target_properties(instrument_cluster_imports PROPERTIES # special case WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) -target_include_directories(imports PUBLIC +target_include_directories(instrument_cluster_imports PUBLIC # special case ${CMAKE_CURRENT_BINARY_DIR}/../frontend ) -target_link_libraries(imports PUBLIC +target_link_libraries(instrument_cluster_imports PUBLIC # special case # Remove: L${CMAKE_CURRENT_BINARY_DIR}/../ Qt::Core Qt::Gui Qt::IviCore ) -install(TARGETS imports +install(TARGETS instrument_cluster_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 new file mode 100644 index 0000000..d05a645 --- /dev/null +++ b/examples/ivicore/qface-tutorial/chapter4-simulation-behavior/backend_simulator/CMakeLists.txt @@ -0,0 +1,61 @@ +# Generated from backend_simulator.pro. + +cmake_minimum_required(VERSION 3.14) +project(instrumentcluster_simulation LANGUAGES CXX) + +set(CMAKE_INCLUDE_CURRENT_DIR ON) + +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) +set(CMAKE_AUTOUIC ON) + +if(NOT DEFINED INSTALL_EXAMPLESDIR) + set(INSTALL_EXAMPLESDIR "examples") +endif() + +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/ivicore/qface-tutorial/chapter4-simulation-behavior") + +find_package(Qt6 COMPONENTS Core) +find_package(Qt6 COMPONENTS Gui) +find_package(Qt6 COMPONENTS IviCore) + +qt_add_plugin(instrumentcluster_simulation) + +# IVI Generator: +qt6_ivigenerator(instrumentcluster_simulation + QFACE_SOURCES ../instrument-cluster.qface + QFACE_FORMAT backend_simulator +) +set_target_properties(instrumentcluster_simulation PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) +target_include_directories(instrumentcluster_simulation PUBLIC + ${CMAKE_CURRENT_BINARY_DIR}/../frontend +) + +target_link_libraries(instrumentcluster_simulation PUBLIC + # Remove: L${CMAKE_CURRENT_BINARY_DIR}/../ + Qt::Core + Qt::Gui + Qt::IviCore +) + + +# Resources: +set(simulation_resource_files + "simulation.qml" +) + +qt6_add_resources(instrumentcluster_simulation "simulation" + PREFIX + "/" + FILES + ${simulation_resource_files} +) + +install(TARGETS instrumentcluster_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 6ee4d49..92b465b 100644 --- a/examples/ivicore/qface-tutorial/chapter4-simulation-behavior/frontend/CMakeLists.txt +++ b/examples/ivicore/qface-tutorial/chapter4-simulation-behavior/frontend/CMakeLists.txt @@ -21,6 +21,12 @@ find_package(Qt6 COMPONENTS IviCore) find_package(Qt6 COMPONENTS Qml) find_package(Qt6 COMPONENTS Quick) +qt_add_executable(QtIviInstrumentCluster) + +# IVI Generator: +qt6_ivigenerator(QtIviInstrumentCluster + QFACE_SOURCES ../instrument-cluster.qface + QFACE_FORMAT frontend ) set_target_properties(QtIviInstrumentCluster PROPERTIES WIN32_EXECUTABLE TRUE 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 780e019..b55a4e8 100644 --- a/examples/ivicore/qface-tutorial/chapter4-simulation-behavior/imports/CMakeLists.txt +++ b/examples/ivicore/qface-tutorial/chapter4-simulation-behavior/imports/CMakeLists.txt @@ -1,7 +1,7 @@ # Generated from imports.pro. cmake_minimum_required(VERSION 3.14) -project(imports LANGUAGES CXX) +project(instrument_cluster_imports LANGUAGES CXX) # special case set(CMAKE_INCLUDE_CURRENT_DIR ON) @@ -19,23 +19,28 @@ find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) find_package(Qt6 COMPONENTS IviCore) + +# IVI Generator: +qt6_ivigenerator(instrument_cluster_imports # special case + QFACE_SOURCES ../instrument-cluster.qface + QFACE_FORMAT qmlplugin ) -set_target_properties(imports PROPERTIES +set_target_properties(instrument_cluster_imports PROPERTIES # special case WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) -target_include_directories(imports PUBLIC +target_include_directories(instrument_cluster_imports PUBLIC # special case ${CMAKE_CURRENT_BINARY_DIR}/../frontend ) -target_link_libraries(imports PUBLIC +target_link_libraries(instrument_cluster_imports PUBLIC # special case # Remove: L${CMAKE_CURRENT_BINARY_DIR}/../ Qt::Core Qt::Gui Qt::IviCore ) -install(TARGETS imports +install(TARGETS instrument_cluster_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 80de93e..6171192 100644 --- a/examples/ivicore/qface-tutorial/chapter5-ipc/backend_qtro/CMakeLists.txt +++ b/examples/ivicore/qface-tutorial/chapter5-ipc/backend_qtro/CMakeLists.txt @@ -19,6 +19,12 @@ find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) find_package(Qt6 COMPONENTS IviCore) +qt_add_plugin(instrumentcluster_qtro) + +# IVI Generator: +qt6_ivigenerator(instrumentcluster_qtro + QFACE_SOURCES ../instrument-cluster.qface + QFACE_FORMAT backend_qtro ) set_target_properties(instrumentcluster_qtro PROPERTIES WIN32_EXECUTABLE TRUE diff --git a/examples/ivicore/qface-tutorial/chapter5-ipc/backend_simulator/CMakeLists.txt b/examples/ivicore/qface-tutorial/chapter5-ipc/backend_simulator/CMakeLists.txt new file mode 100644 index 0000000..6db7b24 --- /dev/null +++ b/examples/ivicore/qface-tutorial/chapter5-ipc/backend_simulator/CMakeLists.txt @@ -0,0 +1,61 @@ +# Generated from backend_simulator.pro. + +cmake_minimum_required(VERSION 3.14) +project(instrumentcluster_simulation LANGUAGES CXX) + +set(CMAKE_INCLUDE_CURRENT_DIR ON) + +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) +set(CMAKE_AUTOUIC ON) + +if(NOT DEFINED INSTALL_EXAMPLESDIR) + set(INSTALL_EXAMPLESDIR "examples") +endif() + +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/ivicore/qface-tutorial/chapter5-ipc") + +find_package(Qt6 COMPONENTS Core) +find_package(Qt6 COMPONENTS Gui) +find_package(Qt6 COMPONENTS IviCore) + +qt_add_plugin(instrumentcluster_simulation) + +# IVI Generator: +qt6_ivigenerator(instrumentcluster_simulation + QFACE_SOURCES ../instrument-cluster.qface + QFACE_FORMAT backend_simulator +) +set_target_properties(instrumentcluster_simulation PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) +target_include_directories(instrumentcluster_simulation PUBLIC + ${CMAKE_CURRENT_BINARY_DIR}/../frontend +) + +target_link_libraries(instrumentcluster_simulation PUBLIC + # Remove: L${CMAKE_CURRENT_BINARY_DIR}/../ + Qt::Core + Qt::Gui + Qt::IviCore +) + + +# Resources: +set(simulation_resource_files + "simulation.qml" +) + +qt6_add_resources(instrumentcluster_simulation "simulation" + PREFIX + "/" + FILES + ${simulation_resource_files} +) + +install(TARGETS instrumentcluster_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 422563e..0927186 100644 --- a/examples/ivicore/qface-tutorial/chapter5-ipc/frontend/CMakeLists.txt +++ b/examples/ivicore/qface-tutorial/chapter5-ipc/frontend/CMakeLists.txt @@ -21,6 +21,12 @@ find_package(Qt6 COMPONENTS IviCore) find_package(Qt6 COMPONENTS Qml) find_package(Qt6 COMPONENTS Quick) +qt_add_executable(QtIviInstrumentCluster) + +# IVI Generator: +qt6_ivigenerator(QtIviInstrumentCluster + QFACE_SOURCES ../instrument-cluster.qface + QFACE_FORMAT frontend ) set_target_properties(QtIviInstrumentCluster PROPERTIES WIN32_EXECUTABLE TRUE diff --git a/examples/ivicore/qface-tutorial/chapter5-ipc/imports/CMakeLists.txt b/examples/ivicore/qface-tutorial/chapter5-ipc/imports/CMakeLists.txt index 03b4cc9..768b549 100644 --- a/examples/ivicore/qface-tutorial/chapter5-ipc/imports/CMakeLists.txt +++ b/examples/ivicore/qface-tutorial/chapter5-ipc/imports/CMakeLists.txt @@ -19,6 +19,11 @@ find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) find_package(Qt6 COMPONENTS IviCore) + +# IVI Generator: +qt6_ivigenerator(imports + QFACE_SOURCES ../instrument-cluster.qface + QFACE_FORMAT qmlplugin ) set_target_properties(imports PROPERTIES WIN32_EXECUTABLE TRUE diff --git a/examples/ivicore/qface-tutorial/chapter5-ipc/simulation_server/CMakeLists.txt b/examples/ivicore/qface-tutorial/chapter5-ipc/simulation_server/CMakeLists.txt new file mode 100644 index 0000000..15105dc --- /dev/null +++ b/examples/ivicore/qface-tutorial/chapter5-ipc/simulation_server/CMakeLists.txt @@ -0,0 +1,65 @@ +# Generated from simulation_server.pro. + +cmake_minimum_required(VERSION 3.14) +project(chapter5-ipc-server LANGUAGES CXX) + +set(CMAKE_INCLUDE_CURRENT_DIR ON) + +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) +set(CMAKE_AUTOUIC ON) + +if(NOT DEFINED INSTALL_EXAMPLESDIR) + set(INSTALL_EXAMPLESDIR "examples") +endif() + +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/ivicore/qface-tutorial/chapter5-ipc/simulation_server") + +find_package(Qt6 COMPONENTS Core) +find_package(Qt6 COMPONENTS IviCore) + +qt_add_executable(chapter5-ipc-server) + +# IVI Generator: +qt6_ivigenerator(chapter5-ipc-server + QFACE_SOURCES ../instrument-cluster.qface + QFACE_FORMAT server_qtro_simulator +) +set_target_properties(chapter5-ipc-server PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE FALSE +) +target_include_directories(chapter5-ipc-server PUBLIC + ${CMAKE_CURRENT_BINARY_DIR}/../frontend +) + +target_link_libraries(chapter5-ipc-server PUBLIC + # Remove: L${CMAKE_CURRENT_BINARY_DIR}/../ + # Remove: gui + Qt::Core + Qt::IviCore +) + + +# Resources: +set_source_files_properties("../backend_simulator/simulation.qml" + PROPERTIES QT_RESOURCE_ALIAS "simulation.qml" +) +set(simulation_resource_files + "simulation.qml" +) + +qt6_add_resources(chapter5-ipc-server "simulation" + PREFIX + "/" + BASE + "../backend_simulator" + FILES + ${simulation_resource_files} +) + +install(TARGETS chapter5-ipc-server + RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" + BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" +) 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 new file mode 100644 index 0000000..e3227a0 --- /dev/null +++ b/examples/ivicore/qface-tutorial/chapter6-own-backend/backend_simulator/CMakeLists.txt @@ -0,0 +1,61 @@ +# Generated from backend_simulator.pro. + +cmake_minimum_required(VERSION 3.14) +project(instrumentcluster_simulation LANGUAGES CXX) + +set(CMAKE_INCLUDE_CURRENT_DIR ON) + +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) +set(CMAKE_AUTOUIC ON) + +if(NOT DEFINED INSTALL_EXAMPLESDIR) + set(INSTALL_EXAMPLESDIR "examples") +endif() + +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/ivicore/qface-tutorial/chapter6-own-backend") + +find_package(Qt6 COMPONENTS Core) +find_package(Qt6 COMPONENTS Gui) +find_package(Qt6 COMPONENTS IviCore) + +qt_add_plugin(instrumentcluster_simulation) + +# IVI Generator: +qt6_ivigenerator(instrumentcluster_simulation + QFACE_SOURCES ../instrument-cluster.qface + QFACE_FORMAT backend_simulator +) +set_target_properties(instrumentcluster_simulation PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) +target_include_directories(instrumentcluster_simulation PUBLIC + ${CMAKE_CURRENT_BINARY_DIR}/../frontend +) + +target_link_libraries(instrumentcluster_simulation PUBLIC + # Remove: L${CMAKE_CURRENT_BINARY_DIR}/../ + Qt::Core + Qt::Gui + Qt::IviCore +) + + +# Resources: +set(simulation_resource_files + "simulation.qml" +) + +qt6_add_resources(instrumentcluster_simulation "simulation" + PREFIX + "/" + FILES + ${simulation_resource_files} +) + +install(TARGETS instrumentcluster_simulation + RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" + BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" +) 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 6ca6d2a..2b0fc93 100644 --- a/examples/ivicore/qface-tutorial/chapter6-own-backend/frontend/CMakeLists.txt +++ b/examples/ivicore/qface-tutorial/chapter6-own-backend/frontend/CMakeLists.txt @@ -21,6 +21,12 @@ find_package(Qt6 COMPONENTS IviCore) find_package(Qt6 COMPONENTS Qml) find_package(Qt6 COMPONENTS Quick) +qt_add_executable(QtIviInstrumentCluster) + +# IVI Generator: +qt6_ivigenerator(QtIviInstrumentCluster + QFACE_SOURCES ../instrument-cluster.qface + QFACE_FORMAT frontend ) set_target_properties(QtIviInstrumentCluster PROPERTIES WIN32_EXECUTABLE TRUE 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 b19a870..9723bd9 100644 --- a/examples/ivicore/qface-tutorial/chapter6-own-backend/imports/CMakeLists.txt +++ b/examples/ivicore/qface-tutorial/chapter6-own-backend/imports/CMakeLists.txt @@ -19,6 +19,11 @@ find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) find_package(Qt6 COMPONENTS IviCore) + +# IVI Generator: +qt6_ivigenerator(imports + QFACE_SOURCES ../instrument-cluster.qface + QFACE_FORMAT qmlplugin ) set_target_properties(imports PROPERTIES WIN32_EXECUTABLE TRUE diff --git a/examples/ivivehiclefunctions/climate_widget/CMakeLists.txt b/examples/ivivehiclefunctions/climate_widget/CMakeLists.txt index e7eb371..0e1e124 100644 --- a/examples/ivivehiclefunctions/climate_widget/CMakeLists.txt +++ b/examples/ivivehiclefunctions/climate_widget/CMakeLists.txt @@ -18,6 +18,7 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/ivivehiclefunctions/climate_widge find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) find_package(Qt6 COMPONENTS IviCore) +find_package(Qt6 COMPONENTS IviVehicleFunctions) qt_add_executable(climate_widget main.cpp @@ -31,7 +32,7 @@ target_link_libraries(climate_widget PUBLIC Qt::Core Qt::Gui Qt::IviCore - ivivehiclefunctions + Qt::IviVehicleFunctions ) if((QT_MAJOR_VERSION GREATER 4)) -- cgit v1.2.1