diff options
Diffstat (limited to 'tests/auto/core/ivigenerator')
31 files changed, 850 insertions, 522 deletions
diff --git a/tests/auto/core/ivigenerator/custom-template/CMakeLists.txt b/tests/auto/core/ivigenerator/custom-template/CMakeLists.txt index cc20e04..46bf61a 100644 --- a/tests/auto/core/ivigenerator/custom-template/CMakeLists.txt +++ b/tests/auto/core/ivigenerator/custom-template/CMakeLists.txt @@ -1,14 +1,43 @@ # Generated from custom-template.pro. -##################################################################### -## tst_custom-template Test: -##################################################################### +cmake_minimum_required(VERSION 3.14) +project(tst_custom-template LANGUAGES CXX) -qt_add_test(tst_custom-template - PUBLIC_LIBRARIES - Qt::Gui +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}") + +find_package(Qt6 COMPONENTS Core) +find_package(Qt6 COMPONENTS Gui) +find_package(Qt6 COMPONENTS Test) + +qt_add_executable(tst_custom-template) + +# IVI Generator: +qt6_ivigenerator(tst_custom-template + QFACE_SOURCES ../org.example.echo.qface + QFACE_FORMAT custom-test +) +set_target_properties(tst_custom-template PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) +target_link_libraries(tst_custom-template PUBLIC + Qt::Core + Qt::Gui + Qt::Test ) -#### Keys ignored in scope 1:.:.:custom-template.pro:<TRUE>: -# QFACE_FORMAT = "$$PWD/custom-test" -# QFACE_SOURCES = "../org.example.echo.qface" +install(TARGETS tst_custom-template + RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" + BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" +) diff --git a/tests/auto/core/ivigenerator/custom-template/custom-test.yaml b/tests/auto/core/ivigenerator/custom-template/custom-test.yaml index 4c5cd17..bc69075 100644 --- a/tests/auto/core/ivigenerator/custom-template/custom-test.yaml +++ b/tests/auto/core/ivigenerator/custom-template/custom-test.yaml @@ -2,6 +2,8 @@ generate_rules: module_rules: - dest_file: "{{srcBase|lower}}.pri" template_file: "module.pri.tpl" + - dest_file: '{{srcBase|lower}}.cmake' + template_file: 'CMakeLists.txt.tpl' - dest_file: 'tst_custom.cpp' template_file: 'tst_custom.cpp.tpl' - dest_file: 'tst_custom.h' diff --git a/tests/auto/core/ivigenerator/custom-template/custom-test/CMakeLists.txt.tpl b/tests/auto/core/ivigenerator/custom-template/custom-test/CMakeLists.txt.tpl new file mode 100644 index 0000000..10fe633 --- /dev/null +++ b/tests/auto/core/ivigenerator/custom-template/custom-test/CMakeLists.txt.tpl @@ -0,0 +1,4 @@ +target_sources(${CURRENT_TARGET} + PUBLIC + tst_custom.cpp +) diff --git a/tests/auto/core/ivigenerator/projects/include-test/backend_qtro/CMakeLists.txt b/tests/auto/core/ivigenerator/projects/include-test/backend_qtro/CMakeLists.txt index 40e733d..e770318 100644 --- a/tests/auto/core/ivigenerator/projects/include-test/backend_qtro/CMakeLists.txt +++ b/tests/auto/core/ivigenerator/projects/include-test/backend_qtro/CMakeLists.txt @@ -1,27 +1,47 @@ # Generated from backend_qtro.pro. -##################################################################### -## include_test_qtro Generic Library: -##################################################################### - -qt_add_cmake_library(include_test_qtro - MODULE - OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../qtivi" - INCLUDE_DIRECTORIES - ${CMAKE_CURRENT_BINARY_DIR}/../common - ${CMAKE_CURRENT_BINARY_DIR}/../frontend - PUBLIC_LIBRARIES - # Remove: L${CMAKE_CURRENT_BINARY_DIR}/.. - Qt::Core - Qt::Gui - Qt::IviCore +cmake_minimum_required(VERSION 3.14) +project(include_test_qtro 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}") + +qt_add_plugin(include_test_qtro) + +# IVI Generator: +qt6_ivigenerator(include_test_qtro + QFACE_SOURCES ../../../include-test.qface + QFACE_FORMAT backend_qtro + QFACE_IMPORT_PATH ../../../qface\ imports +) +set_target_properties(include_test_qtro PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) +target_include_directories(include_test_qtro PUBLIC + ${CMAKE_CURRENT_BINARY_DIR}/../common + ${CMAKE_CURRENT_BINARY_DIR}/../frontend ) -qt_disable_warnings(include_test_qtro) -#### Keys ignored in scope 1:.:.:backend_qtro.pro:<TRUE>: -# QFACE_FORMAT = "backend_qtro" -# QFACE_IMPORT_PATH = "../../../qface imports" -# QFACE_SOURCES = "../../../include-test.qface" -# TEMPLATE = "lib" +target_link_libraries(include_test_qtro PUBLIC + # Remove: L${CMAKE_CURRENT_BINARY_DIR}/.. + include_test_frontend + Qt::Core + Qt::Gui + Qt::IviCore +) -qt_autogen_tools_initial_setup(include_test_qtro) +install(TARGETS include_test_qtro + RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" + BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" +) diff --git a/tests/auto/core/ivigenerator/projects/include-test/backend_simulator/CMakeLists.txt b/tests/auto/core/ivigenerator/projects/include-test/backend_simulator/CMakeLists.txt index 000ab62..ec5434d 100644 --- a/tests/auto/core/ivigenerator/projects/include-test/backend_simulator/CMakeLists.txt +++ b/tests/auto/core/ivigenerator/projects/include-test/backend_simulator/CMakeLists.txt @@ -1,27 +1,22 @@ # Generated from backend_simulator.pro. +set(CMAKE_INCLUDE_CURRENT_DIR ON) -##################################################################### -## include_test_simulator Generic Library: -##################################################################### +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) +set(CMAKE_AUTOUIC ON) -qt_add_cmake_library(include_test_simulator - MODULE - OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../qtivi" - INCLUDE_DIRECTORIES - ${CMAKE_CURRENT_BINARY_DIR}/../common - ${CMAKE_CURRENT_BINARY_DIR}/../frontend - PUBLIC_LIBRARIES - # Remove: L${CMAKE_CURRENT_BINARY_DIR}/.. - Qt::Core - Qt::Gui - Qt::IviCore -) -qt_disable_warnings(include_test_simulator) +qt_add_plugin(include_test_simulator) -#### Keys ignored in scope 1:.:.:backend_simulator.pro:<TRUE>: -# QFACE_FORMAT = "backend_simulator" -# QFACE_IMPORT_PATH = "../../../qface imports" -# QFACE_SOURCES = "../../../include-test.qface" -# TEMPLATE = "lib" +# IVI Generator: +qt6_ivigenerator(include_test_simulator + QFACE_SOURCES ../../../include-test.qface + QFACE_FORMAT backend_simulator + QFACE_IMPORT_PATH ../../../qface\ imports +) -qt_autogen_tools_initial_setup(include_test_simulator) +target_link_libraries(include_test_simulator PUBLIC + include_test_frontend + Qt::Core + Qt::Gui + Qt::IviCore +) diff --git a/tests/auto/core/ivigenerator/projects/include-test/common/CMakeLists.txt b/tests/auto/core/ivigenerator/projects/include-test/common/CMakeLists.txt index b7f1b53..6582d44 100644 --- a/tests/auto/core/ivigenerator/projects/include-test/common/CMakeLists.txt +++ b/tests/auto/core/ivigenerator/projects/include-test/common/CMakeLists.txt @@ -1,28 +1,27 @@ # Generated from common.pro. +set(CMAKE_INCLUDE_CURRENT_DIR ON) -##################################################################### -## include_test_common Generic Library: -##################################################################### +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) +set(CMAKE_AUTOUIC ON) -qt_add_cmake_library(include_test_common - OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" - DEFINES - QT_BUILD_COMMON_LIB - PUBLIC_LIBRARIES - Qt::Core - Qt::Gui - Qt::IviCore - Qt::IviCorePrivate - Qt::Qml - Qt::Quick -) +add_library(include_test_common) -#### Keys ignored in scope 1:.:.:common.pro:<TRUE>: -# QFACE_SOURCES = "../../../qface imports/common.qface" -# TEMPLATE = "lib" +# IVI Generator: +qt6_ivigenerator(include_test_common + QFACE_SOURCES ../../../qface\ imports/common.qface + QFACE_FORMAT frontend +) +target_include_directories(include_test_common PUBLIC + ${CMAKE_CURRENT_BINARY_DIR} +) -## Scopes: -##################################################################### +target_link_libraries(include_test_common PUBLIC + Qt::Core + Qt::Gui + Qt::IviCore + Qt::IviCorePrivate + Qt::Qml + Qt::Quick +) -#### Keys ignored in scope 2:.:.:common.pro:MACOS: -# QMAKE_SONAME_PREFIX = "@rpath" diff --git a/tests/auto/core/ivigenerator/projects/include-test/frontend/CMakeLists.txt b/tests/auto/core/ivigenerator/projects/include-test/frontend/CMakeLists.txt index 81f7469..1485e00 100644 --- a/tests/auto/core/ivigenerator/projects/include-test/frontend/CMakeLists.txt +++ b/tests/auto/core/ivigenerator/projects/include-test/frontend/CMakeLists.txt @@ -1,32 +1,28 @@ # Generated from frontend.pro. +set(CMAKE_INCLUDE_CURRENT_DIR ON) -##################################################################### -## include_test_frontend Generic Library: -##################################################################### +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) +set(CMAKE_AUTOUIC ON) -qt_add_cmake_library(include_test_frontend - OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" - DEFINES - QT_BUILD_INCLUDE_TEST_LIB - INCLUDE_DIRECTORIES - ${CMAKE_CURRENT_BINARY_DIR}/../common - PUBLIC_LIBRARIES - # Remove: L${CMAKE_CURRENT_BINARY_DIR}/.. - Qt::Core - Qt::Gui - Qt::IviCore - Qt::IviCorePrivate - Qt::Qml - Qt::Quick -) - -#### Keys ignored in scope 1:.:.:frontend.pro:<TRUE>: -# QFACE_IMPORT_PATH = "../../../qface imports" -# QFACE_SOURCES = "../../../include-test.qface" -# TEMPLATE = "lib" +add_library(include_test_frontend) -## Scopes: -##################################################################### +# IVI Generator: +qt6_ivigenerator(include_test_frontend + QFACE_SOURCES ../../../include-test.qface + QFACE_FORMAT frontend + QFACE_IMPORT_PATH ../../../qface\ imports +) +target_include_directories(include_test_frontend PUBLIC + ${CMAKE_CURRENT_BINARY_DIR} +) -#### Keys ignored in scope 2:.:.:frontend.pro:MACOS: -# QMAKE_SONAME_PREFIX = "@rpath" +target_link_libraries(include_test_frontend PUBLIC + include_test_common + Qt::Core + Qt::Gui + Qt::IviCore + Qt::IviCorePrivate + Qt::Qml + Qt::Quick +) diff --git a/tests/auto/core/ivigenerator/projects/include-test/qmlplugin/CMakeLists.txt b/tests/auto/core/ivigenerator/projects/include-test/qmlplugin/CMakeLists.txt index 489f8fd..3511ea3 100644 --- a/tests/auto/core/ivigenerator/projects/include-test/qmlplugin/CMakeLists.txt +++ b/tests/auto/core/ivigenerator/projects/include-test/qmlplugin/CMakeLists.txt @@ -1,23 +1,18 @@ # Generated from qmlplugin.pro. +set(CMAKE_INCLUDE_CURRENT_DIR ON) -##################################################################### -## qmlplugin Generic Library: -##################################################################### +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) +set(CMAKE_AUTOUIC ON) -qt_add_cmake_library(qmlplugin - MODULE - INCLUDE_DIRECTORIES - ${CMAKE_CURRENT_BINARY_DIR}/../common - ${CMAKE_CURRENT_BINARY_DIR}/../frontend - PUBLIC_LIBRARIES - # Remove: L${CMAKE_CURRENT_BINARY_DIR}/.. - Qt::IviCore +# IVI Generator: +qt6_ivigenerator(qmlplugin + QFACE_SOURCES ../../../include-test.qface + QFACE_FORMAT qmlplugin + QFACE_IMPORT_PATH ../../../qface\ imports ) -#### Keys ignored in scope 1:.:.:qmlplugin.pro:<TRUE>: -# QFACE_FORMAT = "qmlplugin" -# QFACE_IMPORT_PATH = "../../../qface imports" -# QFACE_SOURCES = "../../../include-test.qface" -# TEMPLATE = "lib" - -qt_autogen_tools_initial_setup(qmlplugin) +target_link_libraries(qmlplugin PRIVATE + include_test_frontend + Qt::IviCore +) diff --git a/tests/auto/core/ivigenerator/projects/include-test/simulation_server_qtro/CMakeLists.txt b/tests/auto/core/ivigenerator/projects/include-test/simulation_server_qtro/CMakeLists.txt index 5af54a0..404f963 100644 --- a/tests/auto/core/ivigenerator/projects/include-test/simulation_server_qtro/CMakeLists.txt +++ b/tests/auto/core/ivigenerator/projects/include-test/simulation_server_qtro/CMakeLists.txt @@ -1,24 +1,48 @@ # Generated from simulation_server_qtro.pro. -##################################################################### -## org-example-echo-qtro-simulation-server Binary: -##################################################################### - -qt_add_executable(org-example-echo-qtro-simulation-server - OUTPUT_DIRECTORY ".." - INCLUDE_DIRECTORIES - ${CMAKE_CURRENT_BINARY_DIR}/../common - ${CMAKE_CURRENT_BINARY_DIR}/../frontend - PUBLIC_LIBRARIES - # Remove: L${CMAKE_CURRENT_BINARY_DIR}/.. - Qt::Gui - Qt::IviCore - Qt::Qml - Qt::Quick +cmake_minimum_required(VERSION 3.14) +project(org-example-echo-qtro-simulation-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}") + +qt_add_executable(org-example-echo-qtro-simulation-server) + +# IVI Generator: +qt6_ivigenerator(org-example-echo-qtro-simulation-server + QFACE_SOURCES ../../../include-test.qface + QFACE_FORMAT server_qtro_simulator + QFACE_IMPORT_PATH ../../../qface\ imports +) +set_target_properties(org-example-echo-qtro-simulation-server PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE FALSE +) +target_include_directories(org-example-echo-qtro-simulation-server PUBLIC + ${CMAKE_CURRENT_BINARY_DIR}/../common + ${CMAKE_CURRENT_BINARY_DIR}/../frontend ) -#### Keys ignored in scope 1:.:.:simulation_server_qtro.pro:<TRUE>: -# QFACE_FORMAT = "server_qtro_simulator" -# QFACE_IMPORT_PATH = "../../../qface imports" -# QFACE_SOURCES = "../../../include-test.qface" -# TEMPLATE = "app" +target_link_libraries(org-example-echo-qtro-simulation-server PUBLIC + # Remove: L${CMAKE_CURRENT_BINARY_DIR}/.. + Qt::Core + Qt::Gui + Qt::IviCore + Qt::Qml + Qt::Quick +) + +install(TARGETS org-example-echo-qtro-simulation-server + RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" + BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" +) diff --git a/tests/auto/core/ivigenerator/projects/include-test/test/CMakeLists.txt b/tests/auto/core/ivigenerator/projects/include-test/test/CMakeLists.txt index f70b4c9..5bd474a 100644 --- a/tests/auto/core/ivigenerator/projects/include-test/test/CMakeLists.txt +++ b/tests/auto/core/ivigenerator/projects/include-test/test/CMakeLists.txt @@ -1,23 +1,28 @@ # Generated from test.pro. +set(CMAKE_INCLUDE_CURRENT_DIR ON) -##################################################################### -## tst_include Test: -##################################################################### +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) +set(CMAKE_AUTOUIC ON) -qt_add_test(tst_include - OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" - INCLUDE_DIRECTORIES - ${CMAKE_CURRENT_BINARY_DIR}/../common - ${CMAKE_CURRENT_BINARY_DIR}/../frontend - PUBLIC_LIBRARIES - # Remove: L${CMAKE_CURRENT_BINARY_DIR}/.. - Qt::Gui - Qt::IviCore +qt_add_executable(tst_include) + +# IVI Generator: +qt6_ivigenerator(tst_include + QFACE_SOURCES ../../../include-test.qface + QFACE_FORMAT test + QFACE_IMPORT_PATH ../../../qface\ imports +) +set_target_properties(tst_include PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE ) -#### Keys ignored in scope 1:.:.:test.pro:<TRUE>: -# QFACE_FORMAT = "test" -# QFACE_IMPORT_PATH = "../../../qface imports" -# QFACE_SOURCES = "../../../include-test.qface" -# QMAKE_PROJECT_NAME = "$$TARGET" -# QMAKE_RPATHDIR = "$$OUT_PWD/.." +target_link_libraries(tst_include PUBLIC + include_test_common + include_test_frontend + Qt::Core + Qt::Gui + Qt::IviCore + Qt::Test +) diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/backend_qtro/CMakeLists.txt b/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/backend_qtro/CMakeLists.txt index 66a2c37..b7481c9 100644 --- a/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/backend_qtro/CMakeLists.txt +++ b/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/backend_qtro/CMakeLists.txt @@ -1,25 +1,45 @@ # Generated from backend_qtro.pro. -##################################################################### -## echo_noannotation_qtro Generic Library: -##################################################################### - -qt_add_cmake_library(echo_noannotation_qtro - MODULE - OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../qtivi" - INCLUDE_DIRECTORIES - ${CMAKE_CURRENT_BINARY_DIR}/../frontend - PUBLIC_LIBRARIES - # Remove: L${CMAKE_CURRENT_BINARY_DIR}/.. - Qt::Core - Qt::Gui - Qt::IviCore +cmake_minimum_required(VERSION 3.14) +project(echo_noannotation_qtro 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}") + +qt_add_plugin(echo_noannotation_qtro) + +# IVI Generator: +qt6_ivigenerator(echo_noannotation_qtro + QFACE_SOURCES ../../../org.example.echo.noannotation.qface + QFACE_FORMAT backend_qtro +) +set_target_properties(echo_noannotation_qtro PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) +target_include_directories(echo_noannotation_qtro PUBLIC + ${CMAKE_CURRENT_BINARY_DIR}/../frontend ) -qt_disable_warnings(echo_noannotation_qtro) -#### Keys ignored in scope 1:.:.:backend_qtro.pro:<TRUE>: -# QFACE_FORMAT = "backend_qtro" -# QFACE_SOURCES = "../../../org.example.echo.noannotation.qface" -# TEMPLATE = "lib" +target_link_libraries(echo_noannotation_qtro PUBLIC + # Remove: L${CMAKE_CURRENT_BINARY_DIR}/.. + echo_noannotation_frontend + Qt::Core + Qt::Gui + Qt::IviCore +) -qt_autogen_tools_initial_setup(echo_noannotation_qtro) +install(TARGETS echo_noannotation_qtro + RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" + BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" +) diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/backend_simulator/CMakeLists.txt b/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/backend_simulator/CMakeLists.txt index 81c7410..8390845 100644 --- a/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/backend_simulator/CMakeLists.txt +++ b/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/backend_simulator/CMakeLists.txt @@ -1,25 +1,21 @@ # Generated from backend_simulator.pro. +set(CMAKE_INCLUDE_CURRENT_DIR ON) -##################################################################### -## echo_noannotation_simulator Generic Library: -##################################################################### +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) +set(CMAKE_AUTOUIC ON) -qt_add_cmake_library(echo_noannotation_simulator - MODULE - OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../qtivi" - INCLUDE_DIRECTORIES - ${CMAKE_CURRENT_BINARY_DIR}/../frontend - PUBLIC_LIBRARIES - # Remove: L${CMAKE_CURRENT_BINARY_DIR}/.. - Qt::Core - Qt::Gui - Qt::IviCore -) -qt_disable_warnings(echo_noannotation_simulator) +qt_add_plugin(echo_noanno_simulator) -#### Keys ignored in scope 1:.:.:backend_simulator.pro:<TRUE>: -# QFACE_FORMAT = "backend_simulator" -# QFACE_SOURCES = "../../../org.example.echo.noannotation.qface" -# TEMPLATE = "lib" +# IVI Generator: +qt6_ivigenerator(echo_noanno_simulator + QFACE_SOURCES ../../../org.example.echo.noannotation.qface + QFACE_FORMAT backend_simulator +) -qt_autogen_tools_initial_setup(echo_noannotation_simulator) +target_link_libraries(echo_noanno_simulator PUBLIC + echo_noanno_frontend + Qt::Core + Qt::Gui + Qt::IviCore +) diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/frontend/CMakeLists.txt b/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/frontend/CMakeLists.txt index 0175304..c0162a1 100644 --- a/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/frontend/CMakeLists.txt +++ b/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/frontend/CMakeLists.txt @@ -1,28 +1,26 @@ # Generated from frontend.pro. +set(CMAKE_INCLUDE_CURRENT_DIR ON) -##################################################################### -## echo_noannotation_frontend Generic Library: -##################################################################### +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) +set(CMAKE_AUTOUIC ON) -qt_add_cmake_library(echo_noannotation_frontend - OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" - DEFINES - QT_BUILD_ORG_EXAMPLE_ECHO_LIB - PUBLIC_LIBRARIES - Qt::Core - Qt::Gui - Qt::IviCore - Qt::IviCorePrivate - Qt::Qml - Qt::Quick -) - -#### Keys ignored in scope 1:.:.:frontend.pro:<TRUE>: -# QFACE_SOURCES = "../../../org.example.echo.noannotation.qface" -# TEMPLATE = "lib" +add_library(echo_noanno_frontend) -## Scopes: -##################################################################### +# IVI Generator: +qt6_ivigenerator(echo_noanno_frontend + QFACE_SOURCES ../../../org.example.echo.noannotation.qface + QFACE_FORMAT frontend +) +target_include_directories(echo_noanno_frontend PUBLIC + ${CMAKE_CURRENT_BINARY_DIR} +) -#### Keys ignored in scope 2:.:.:frontend.pro:MACOS: -# QMAKE_SONAME_PREFIX = "@rpath" +target_link_libraries(echo_noanno_frontend PUBLIC + Qt::Core + Qt::Gui + Qt::IviCore + Qt::IviCorePrivate + Qt::Qml + Qt::Quick +) diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/qmlplugin/.prev_CMakeLists.txt b/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/qmlplugin/.prev_CMakeLists.txt new file mode 100644 index 0000000..1c6b8ca --- /dev/null +++ b/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/qmlplugin/.prev_CMakeLists.txt @@ -0,0 +1,45 @@ +# Generated from qmlplugin.pro. + +cmake_minimum_required(VERSION 3.14) +project(qmlplugin 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}") + +find_package(Qt6 COMPONENTS IviCore) +find_package(Qt6 COMPONENTS IviVehicleFunctions) + + +# IVI Generator: +qt6_ivigenerator(qmlplugin + QFACE_SOURCES ../../../org.example.echo.noannotation.qface + QFACE_FORMAT qmlplugin +) +set_target_properties(qmlplugin PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) +target_include_directories(qmlplugin PUBLIC + ${CMAKE_CURRENT_BINARY_DIR}/../frontend +) + +target_link_libraries(qmlplugin PUBLIC + # Remove: L${CMAKE_CURRENT_BINARY_DIR}/.. + Qt::IviCore + Qt::IviVehicleFunctions +) + +install(TARGETS qmlplugin + RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" + BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" +) diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/qmlplugin/CMakeLists.txt b/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/qmlplugin/CMakeLists.txt index fd709bb..0ec3488 100644 --- a/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/qmlplugin/CMakeLists.txt +++ b/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/qmlplugin/CMakeLists.txt @@ -1,22 +1,18 @@ # Generated from qmlplugin.pro. +set(CMAKE_INCLUDE_CURRENT_DIR ON) -##################################################################### -## qmlplugin Generic Library: -##################################################################### +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) +set(CMAKE_AUTOUIC ON) -qt_add_cmake_library(qmlplugin - MODULE - INCLUDE_DIRECTORIES - ${CMAKE_CURRENT_BINARY_DIR}/../frontend - PUBLIC_LIBRARIES - # Remove: L${CMAKE_CURRENT_BINARY_DIR}/.. - Qt::IviCore - ivivehiclefunctions +# IVI Generator: +qt6_ivigenerator(echo_frontend_noanno_qmlplugin # special case + QFACE_SOURCES ../../../org.example.echo.noannotation.qface + QFACE_FORMAT qmlplugin ) -#### Keys ignored in scope 1:.:.:qmlplugin.pro:<TRUE>: -# QFACE_FORMAT = "qmlplugin" -# QFACE_SOURCES = "../../../org.example.echo.noannotation.qface" -# TEMPLATE = "lib" - -qt_autogen_tools_initial_setup(qmlplugin) +target_link_libraries(echo_frontend_noanno_qmlplugin PRIVATE # special case + echo_noanno_frontend + Qt::IviCore + Qt::IviVehicleFunctions +) diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/simulation_server_qtro/CMakeLists.txt b/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/simulation_server_qtro/CMakeLists.txt index 774234c..1f41012 100644 --- a/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/simulation_server_qtro/CMakeLists.txt +++ b/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/simulation_server_qtro/CMakeLists.txt @@ -1,23 +1,46 @@ # Generated from simulation_server_qtro.pro. -##################################################################### -## org-example-echo-noannotation-simulation-server Binary: -##################################################################### - -qt_add_executable(org-example-echo-noannotation-simulation-server - OUTPUT_DIRECTORY ".." - INCLUDE_DIRECTORIES - ${CMAKE_CURRENT_BINARY_DIR}/../frontend - PUBLIC_LIBRARIES - # Remove: L${CMAKE_CURRENT_BINARY_DIR}/.. - Qt::Gui - Qt::IviCore - Qt::Qml - Qt::Quick +cmake_minimum_required(VERSION 3.14) +project(org-example-echo-noannotation-simulation-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}") + +qt_add_executable(org-example-echo-noannotation-simulation-server) + +# IVI Generator: +qt6_ivigenerator(org-example-echo-noannotation-simulation-server + QFACE_SOURCES ../../../org.example.echo.noannotation.qface + QFACE_FORMAT server_qtro_simulator +) +set_target_properties(org-example-echo-noannotation-simulation-server PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE FALSE +) +target_include_directories(org-example-echo-noannotation-simulation-server PUBLIC + ${CMAKE_CURRENT_BINARY_DIR}/../frontend ) -#### Keys ignored in scope 1:.:.:simulation_server_qtro.pro:<TRUE>: -# QFACE_FORMAT = "server_qtro_simulator" -# QFACE_SOURCES = "../../../org.example.echo.noannotation.qface" -# QMAKE_PROJECT_NAME = "$$TARGET" -# TEMPLATE = "app" +target_link_libraries(org-example-echo-noannotation-simulation-server PUBLIC + # Remove: L${CMAKE_CURRENT_BINARY_DIR}/.. + Qt::Core + Qt::Gui + Qt::IviCore + Qt::Qml + Qt::Quick +) + +install(TARGETS org-example-echo-noannotation-simulation-server + RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" + BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" +) diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/test/CMakeLists.txt b/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/test/CMakeLists.txt index 558abf5..2cd08aa 100644 --- a/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/test/CMakeLists.txt +++ b/tests/auto/core/ivigenerator/projects/org-example-echo-noannotation/test/CMakeLists.txt @@ -1,21 +1,26 @@ # Generated from test.pro. +set(CMAKE_INCLUDE_CURRENT_DIR ON) -##################################################################### -## tst_org-example-echo-noannotation Test: -##################################################################### +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) +set(CMAKE_AUTOUIC ON) -qt_add_test(tst_org-example-echo-noannotation - OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" - INCLUDE_DIRECTORIES - ${CMAKE_CURRENT_BINARY_DIR}/../frontend - PUBLIC_LIBRARIES - # Remove: L${CMAKE_CURRENT_BINARY_DIR}/.. - Qt::Gui - Qt::IviCore +qt_add_executable(tst_org-example-echo-noanno) + +# IVI Generator: +qt6_ivigenerator(tst_org-example-echo-noanno + QFACE_SOURCES ../../../org.example.echo.noannotation.qface + QFACE_FORMAT test +) +set_target_properties(tst_org-example-echo-noanno PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE ) -#### Keys ignored in scope 1:.:.:test.pro:<TRUE>: -# QFACE_FORMAT = "test" -# QFACE_SOURCES = "../../../org.example.echo.noannotation.qface" -# QMAKE_PROJECT_NAME = "$$TARGET" -# QMAKE_RPATHDIR = "$$OUT_PWD/.." +target_link_libraries(tst_org-example-echo-noanno PUBLIC + echo_noanno_frontend + Qt::Core + Qt::Gui + Qt::IviCore + Qt::Test +) diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-noprivate/backend_simulator/CMakeLists.txt b/tests/auto/core/ivigenerator/projects/org-example-echo-noprivate/backend_simulator/CMakeLists.txt index bd39d36..d0827bd 100644 --- a/tests/auto/core/ivigenerator/projects/org-example-echo-noprivate/backend_simulator/CMakeLists.txt +++ b/tests/auto/core/ivigenerator/projects/org-example-echo-noprivate/backend_simulator/CMakeLists.txt @@ -1,26 +1,22 @@ # Generated from backend_simulator.pro. +set(CMAKE_INCLUDE_CURRENT_DIR ON) -##################################################################### -## echo_noprivate_simulator Generic Library: -##################################################################### +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) +set(CMAKE_AUTOUIC ON) -qt_add_cmake_library(echo_noprivate_simulator - MODULE - OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../qtivi" - INCLUDE_DIRECTORIES - ${CMAKE_CURRENT_BINARY_DIR}/../frontend - PUBLIC_LIBRARIES - # Remove: L${CMAKE_CURRENT_BINARY_DIR}/.. - Qt::Core - Qt::Gui - Qt::IviCore -) -qt_disable_warnings(echo_noprivate_simulator) +qt_add_plugin(echo_noprivate_simulator) -#### Keys ignored in scope 1:.:.:backend_simulator.pro:<TRUE>: -# QFACE_ANNOTATIONS = "../../../no-private.yaml" -# QFACE_FORMAT = "backend_simulator" -# QFACE_SOURCES = "../../../org.example.echo.qface" -# TEMPLATE = "lib" +# IVI Generator: +qt6_ivigenerator(echo_noprivate_simulator + QFACE_SOURCES ../../../org.example.echo.qface + QFACE_FORMAT backend_simulator + QFACE_ANNOTATIONS ../../../no-private.yaml +) -qt_autogen_tools_initial_setup(echo_noprivate_simulator) +target_link_libraries(echo_noprivate_simulator PUBLIC + echo_noprivate_frontend + Qt::Core + Qt::Gui + Qt::IviCore +) diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-noprivate/frontend/CMakeLists.txt b/tests/auto/core/ivigenerator/projects/org-example-echo-noprivate/frontend/CMakeLists.txt index d02ae04..e0bb60e 100644 --- a/tests/auto/core/ivigenerator/projects/org-example-echo-noprivate/frontend/CMakeLists.txt +++ b/tests/auto/core/ivigenerator/projects/org-example-echo-noprivate/frontend/CMakeLists.txt @@ -1,29 +1,27 @@ # Generated from frontend.pro. +set(CMAKE_INCLUDE_CURRENT_DIR ON) -##################################################################### -## echo_noprivate_frontend Generic Library: -##################################################################### +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) +set(CMAKE_AUTOUIC ON) -qt_add_cmake_library(echo_noprivate_frontend - OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" - DEFINES - QT_BUILD_ORG_EXAMPLE_ECHO_LIB - PUBLIC_LIBRARIES - Qt::Core - Qt::Gui - Qt::IviCore - Qt::IviCorePrivate - Qt::Qml - Qt::Quick -) - -#### Keys ignored in scope 1:.:.:frontend.pro:<TRUE>: -# QFACE_ANNOTATIONS = "../../../no-private.yaml" -# QFACE_SOURCES = "../../../org.example.echo.qface" -# TEMPLATE = "lib" +add_library(echo_noprivate_frontend) -## Scopes: -##################################################################### +# IVI Generator: +qt6_ivigenerator(echo_noprivate_frontend + QFACE_SOURCES ../../../org.example.echo.qface + QFACE_FORMAT frontend + QFACE_ANNOTATIONS ../../../no-private.yaml +) +target_include_directories(echo_noprivate_frontend PUBLIC + ${CMAKE_CURRENT_BINARY_DIR} +) -#### Keys ignored in scope 2:.:.:frontend.pro:MACOS: -# QMAKE_SONAME_PREFIX = "@rpath" +target_link_libraries(echo_noprivate_frontend PUBLIC + Qt::Core + Qt::Gui + Qt::IviCore + Qt::IviCorePrivate + Qt::Qml + Qt::Quick +) diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-noprivate/qmlplugin/.prev_CMakeLists.txt b/tests/auto/core/ivigenerator/projects/org-example-echo-noprivate/qmlplugin/.prev_CMakeLists.txt new file mode 100644 index 0000000..446db66 --- /dev/null +++ b/tests/auto/core/ivigenerator/projects/org-example-echo-noprivate/qmlplugin/.prev_CMakeLists.txt @@ -0,0 +1,46 @@ +# Generated from qmlplugin.pro. + +cmake_minimum_required(VERSION 3.14) +project(qmlplugin 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}") + +find_package(Qt6 COMPONENTS IviCore) +find_package(Qt6 COMPONENTS IviVehicleFunctions) + + +# IVI Generator: +qt6_ivigenerator(qmlplugin + QFACE_SOURCES ../../../org.example.echo.qface + QFACE_FORMAT qmlplugin + QFACE_ANNOTATIONS ../../../no-private.yaml +) +set_target_properties(qmlplugin PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) +target_include_directories(qmlplugin PUBLIC + ${CMAKE_CURRENT_BINARY_DIR}/../frontend +) + +target_link_libraries(qmlplugin PUBLIC + # Remove: L${CMAKE_CURRENT_BINARY_DIR}/.. + Qt::IviCore + Qt::IviVehicleFunctions +) + +install(TARGETS qmlplugin + RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" + BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" +) diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-noprivate/qmlplugin/CMakeLists.txt b/tests/auto/core/ivigenerator/projects/org-example-echo-noprivate/qmlplugin/CMakeLists.txt index 4e6a6a7..ada5903 100644 --- a/tests/auto/core/ivigenerator/projects/org-example-echo-noprivate/qmlplugin/CMakeLists.txt +++ b/tests/auto/core/ivigenerator/projects/org-example-echo-noprivate/qmlplugin/CMakeLists.txt @@ -1,23 +1,19 @@ # Generated from qmlplugin.pro. +set(CMAKE_INCLUDE_CURRENT_DIR ON) -##################################################################### -## qmlplugin Generic Library: -##################################################################### +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) +set(CMAKE_AUTOUIC ON) -qt_add_cmake_library(qmlplugin - MODULE - INCLUDE_DIRECTORIES - ${CMAKE_CURRENT_BINARY_DIR}/../frontend - PUBLIC_LIBRARIES - # Remove: L${CMAKE_CURRENT_BINARY_DIR}/.. - Qt::IviCore - ivivehiclefunctions +# IVI Generator: +qt6_ivigenerator(echo_frontend_noprivate_qmlplugin # special case + QFACE_SOURCES ../../../org.example.echo.qface + QFACE_FORMAT qmlplugin + QFACE_ANNOTATIONS ../../../no-private.yaml ) -#### Keys ignored in scope 1:.:.:qmlplugin.pro:<TRUE>: -# QFACE_ANNOTATIONS = "../../../no-private.yaml" -# QFACE_FORMAT = "qmlplugin" -# QFACE_SOURCES = "../../../org.example.echo.qface" -# TEMPLATE = "lib" - -qt_autogen_tools_initial_setup(qmlplugin) +target_link_libraries(echo_frontend_noprivate_qmlplugin PRIVATE # special case + echo_noprivate_frontend + Qt::IviCore + Qt::IviVehicleFunctions +) diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-noprivate/test/CMakeLists.txt b/tests/auto/core/ivigenerator/projects/org-example-echo-noprivate/test/CMakeLists.txt index 8626ddd..16622b2 100644 --- a/tests/auto/core/ivigenerator/projects/org-example-echo-noprivate/test/CMakeLists.txt +++ b/tests/auto/core/ivigenerator/projects/org-example-echo-noprivate/test/CMakeLists.txt @@ -1,22 +1,27 @@ # Generated from test.pro. +set(CMAKE_INCLUDE_CURRENT_DIR ON) -##################################################################### -## tst_org-example-echo-noprivate Test: -##################################################################### +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) +set(CMAKE_AUTOUIC ON) -qt_add_test(tst_org-example-echo-noprivate - OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" - INCLUDE_DIRECTORIES - ${CMAKE_CURRENT_BINARY_DIR}/../frontend - PUBLIC_LIBRARIES - # Remove: L${CMAKE_CURRENT_BINARY_DIR}/.. - Qt::Gui - Qt::IviCore +qt_add_executable(tst_org-example-echo-noprivate) + +# IVI Generator: +qt6_ivigenerator(tst_org-example-echo-noprivate + QFACE_SOURCES ../../../org.example.echo.qface + QFACE_FORMAT test + QFACE_ANNOTATIONS ../../../no-private.yaml +) +set_target_properties(tst_org-example-echo-noprivate PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE ) -#### Keys ignored in scope 1:.:.:test.pro:<TRUE>: -# QFACE_ANNOTATIONS = "../../../no-private.yaml" -# QFACE_FORMAT = "test" -# QFACE_SOURCES = "../../../org.example.echo.qface" -# QMAKE_PROJECT_NAME = "$$TARGET" -# QMAKE_RPATHDIR = "$$OUT_PWD/.." +target_link_libraries(tst_org-example-echo-noprivate PUBLIC + echo_noprivate_frontend + Qt::Core + Qt::Gui + Qt::IviCore + Qt::Test +) diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/backend_qtro/CMakeLists.txt b/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/backend_qtro/CMakeLists.txt index 592ef19..e674c29 100644 --- a/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/backend_qtro/CMakeLists.txt +++ b/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/backend_qtro/CMakeLists.txt @@ -1,31 +1,49 @@ # Generated from backend_qtro.pro. -##################################################################### -## echo_backend_qtro Generic Library: -##################################################################### - -qt_add_cmake_library(echo_backend_qtro - MODULE - OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../qtivi" - INCLUDE_DIRECTORIES - ${CMAKE_CURRENT_BINARY_DIR}/../frontend - PUBLIC_LIBRARIES - # Remove: L${CMAKE_CURRENT_BINARY_DIR}/.. - Qt::Core - Qt::Gui - Qt::IviCore -) -qt_disable_warnings(echo_backend_qtro) +cmake_minimum_required(VERSION 3.14) +project(echo_backend_qtro LANGUAGES CXX) + +set(CMAKE_INCLUDE_CURRENT_DIR ON) + +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) +set(CMAKE_AUTOUIC ON) -#### Keys ignored in scope 1:.:.:backend_qtro.pro:<TRUE>: -# QFACE_FORMAT = "backend_qtro" -# QFACE_SOURCES = "../../../org.example.echo.qface" -# TEMPLATE = "lib" +if(NOT DEFINED INSTALL_EXAMPLESDIR) + set(INSTALL_EXAMPLESDIR "examples") +endif() -## Scopes: -##################################################################### +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}") -#### Keys ignored in scope 2:.:.:backend_qtro.pro:MACOS: -# QMAKE_SONAME_PREFIX = "@rpath" +find_package(Qt6 COMPONENTS Core) +find_package(Qt6 COMPONENTS Gui) +find_package(Qt6 COMPONENTS IviCore) -qt_autogen_tools_initial_setup(echo_backend_qtro) +qt_add_plugin(echo_backend_qtro) + +# IVI Generator: +qt6_ivigenerator(echo_backend_qtro + QFACE_SOURCES ../../../org.example.echo.qface + QFACE_FORMAT backend_qtro +) +set_target_properties(echo_backend_qtro PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) +target_include_directories(echo_backend_qtro PUBLIC + ${CMAKE_CURRENT_BINARY_DIR}/../frontend +) + +target_link_libraries(echo_backend_qtro PUBLIC + # Remove: L${CMAKE_CURRENT_BINARY_DIR}/.. + echo_qtro_frontend + Qt::Core + Qt::Gui + Qt::IviCore +) + +install(TARGETS echo_backend_qtro + RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" + BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" +) diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/frontend/CMakeLists.txt b/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/frontend/CMakeLists.txt index c1ec8bb..73294cc 100644 --- a/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/frontend/CMakeLists.txt +++ b/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/frontend/CMakeLists.txt @@ -1,28 +1,45 @@ # Generated from frontend.pro. -##################################################################### -## echo_frontend Generic Library: -##################################################################### - -qt_add_cmake_library(echo_frontend - OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" - DEFINES - QT_BUILD_ORG_EXAMPLE_ECHO_LIB - PUBLIC_LIBRARIES - Qt::Core - Qt::Gui - Qt::IviCore - Qt::IviCorePrivate - Qt::Qml - Qt::Quick -) +cmake_minimum_required(VERSION 3.14) +project(echo_qtro_frontend 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}") -#### Keys ignored in scope 1:.:.:frontend.pro:<TRUE>: -# QFACE_SOURCES = "../../../org.example.echo.qface" -# TEMPLATE = "lib" +find_package(Qt6 COMPONENTS Core) +find_package(Qt6 COMPONENTS Gui) +find_package(Qt6 COMPONENTS IviCore) +find_package(Qt6 COMPONENTS Qml) +find_package(Qt6 COMPONENTS Quick) -## Scopes: -##################################################################### +qt_add_executable(echo_qtro_frontend) -#### Keys ignored in scope 2:.:.:frontend.pro:MACOS: -# QMAKE_SONAME_PREFIX = "@rpath" +# IVI Generator: +qt6_ivigenerator(echo_qtro_frontend + QFACE_SOURCES ../../../org.example.echo.qface + QFACE_FORMAT frontend +) + +target_link_libraries(echo_frontend PUBLIC + Qt::Core + Qt::Gui + Qt::IviCore + Qt::IviCorePrivate + Qt::Qml + Qt::Quick +) + +install(TARGETS echo_frontend + RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" + BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" +) diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/server_qtro_test/CMakeLists.txt b/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/server_qtro_test/CMakeLists.txt index 985b371..4983874 100644 --- a/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/server_qtro_test/CMakeLists.txt +++ b/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/server_qtro_test/CMakeLists.txt @@ -1,29 +1,58 @@ # Generated from server_qtro_test.pro. -##################################################################### -## tst_org-example-echo-qtro Test: -##################################################################### - -qt_add_test(tst_org-example-echo-qtro - OUTPUT_DIRECTORY ".." - SOURCES - contactsmodelservice.cpp contactsmodelservice.h - echoservice.cpp echoservice.h - echozonedservice.cpp echozonedservice.h - main.cpp - server.cpp server.h - tst_echoqtro.cpp tst_echoqtro.h - INCLUDE_DIRECTORIES - ${CMAKE_CURRENT_BINARY_DIR}/../backend_qtro - ${CMAKE_CURRENT_BINARY_DIR}/../frontend - PUBLIC_LIBRARIES - # Remove: L${CMAKE_CURRENT_BINARY_DIR}/.. - Qt::IviCore - iviremoteobjects_helper_private +cmake_minimum_required(VERSION 3.14) +project(tst_org-example-echo-qtro 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}") + +find_package(Qt6 COMPONENTS Core) +find_package(Qt6 COMPONENTS Test) +find_package(Qt6 COMPONENTS IviCore) + +qt_add_executable(tst_org-example-echo-qtro + contactsmodelservice.cpp contactsmodelservice.h + echoservice.cpp echoservice.h + echozonedservice.cpp echozonedservice.h + main.cpp + server.cpp server.h + tst_echoqtro.cpp tst_echoqtro.h ) -#### Keys ignored in scope 1:.:.:server_qtro_test.pro:<TRUE>: -# QFACE_FORMAT = "server_qtro" -# QFACE_SOURCES = "../../../org.example.echo.qface" -# QMAKE_PROJECT_NAME = "$$TARGET" -# QMAKE_RPATHDIR = "$$OUT_PWD/.." "$$OUT_PWD/../qtivi" +# IVI Generator: +qt6_ivigenerator(tst_org-example-echo-qtro + QFACE_SOURCES ../../../org.example.echo.qface + QFACE_FORMAT server_qtro +) +set_target_properties(tst_org-example-echo-qtro PROPERTIES + WIN32_EXECUTABLE FALSE + MACOSX_BUNDLE FALSE +) +target_include_directories(tst_org-example-echo-qtro PUBLIC + ${CMAKE_CURRENT_BINARY_DIR}/../backend_qtro + ${CMAKE_CURRENT_BINARY_DIR}/../frontend +) + +target_link_libraries(tst_org-example-echo-qtro PUBLIC + # Remove: L${CMAKE_CURRENT_BINARY_DIR}/.. + echo_qtro_frontend + Qt::Core + Qt::IviCore + Qt::Test + iviremoteobjects_helper_private +) + +install(TARGETS tst_org-example-echo-qtro + RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" + BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" +) diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/simulation_server_qtro/CMakeLists.txt b/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/simulation_server_qtro/CMakeLists.txt index 0bb45bb..4c02b19 100644 --- a/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/simulation_server_qtro/CMakeLists.txt +++ b/tests/auto/core/ivigenerator/projects/org-example-echo-qtro/simulation_server_qtro/CMakeLists.txt @@ -1,23 +1,53 @@ # Generated from simulation_server_qtro.pro. -##################################################################### -## org-example-echo-qtro-simulation-server Binary: -##################################################################### - -qt_add_executable(org-example-echo-qtro-simulation-server - OUTPUT_DIRECTORY ".." - INCLUDE_DIRECTORIES - ${CMAKE_CURRENT_BINARY_DIR}/../frontend - PUBLIC_LIBRARIES - # Remove: L${CMAKE_CURRENT_BINARY_DIR}/.. - Qt::Gui - Qt::IviCore - Qt::Qml - Qt::Quick +cmake_minimum_required(VERSION 3.14) +project(org-example-echo-qtro-simulation-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}") + +find_package(Qt6 COMPONENTS Core) +find_package(Qt6 COMPONENTS Gui) +find_package(Qt6 COMPONENTS Qml) +find_package(Qt6 COMPONENTS Quick) +find_package(Qt6 COMPONENTS IviCore) + +qt_add_executable(org-example-echo-qtro-simulation-server) + +# IVI Generator: +qt6_ivigenerator(org-example-echo-qtro-simulation-server + QFACE_SOURCES ../../../org.example.echo.qface + QFACE_FORMAT server_qtro_simulator +) +set_target_properties(org-example-echo-qtro-simulation-server PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE FALSE +) +target_include_directories(org-example-echo-qtro-simulation-server PUBLIC + ${CMAKE_CURRENT_BINARY_DIR}/../frontend ) -#### Keys ignored in scope 1:.:.:simulation_server_qtro.pro:<TRUE>: -# QFACE_FORMAT = "server_qtro_simulator" -# QFACE_SOURCES = "../../../org.example.echo.qface" -# QMAKE_PROJECT_NAME = "$$TARGET" -# TEMPLATE = "app" +target_link_libraries(org-example-echo-qtro-simulation-server PUBLIC + # Remove: L${CMAKE_CURRENT_BINARY_DIR}/.. + echo_qtro_frontend + Qt::Core + Qt::Gui + Qt::IviCore + Qt::Qml + Qt::Quick +) + +install(TARGETS org-example-echo-qtro-simulation-server + RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" + BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" +) diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo/backend_simulator/CMakeLists.txt b/tests/auto/core/ivigenerator/projects/org-example-echo/backend_simulator/CMakeLists.txt index fbbc287..a6e95bd 100644 --- a/tests/auto/core/ivigenerator/projects/org-example-echo/backend_simulator/CMakeLists.txt +++ b/tests/auto/core/ivigenerator/projects/org-example-echo/backend_simulator/CMakeLists.txt @@ -1,27 +1,24 @@ # Generated from backend_simulator.pro. +set(CMAKE_INCLUDE_CURRENT_DIR ON) -##################################################################### -## echo_simulator Generic Library: -##################################################################### +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) +set(CMAKE_AUTOUIC ON) -qt_add_cmake_library(echo_simulator - MODULE - OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../qtivi" - SOURCES - backend_simulator.cpp - INCLUDE_DIRECTORIES - ${CMAKE_CURRENT_BINARY_DIR}/../frontend - PUBLIC_LIBRARIES - # Remove: L${CMAKE_CURRENT_BINARY_DIR}/.. - Qt::Core - Qt::Gui - Qt::IviCore +qt_add_plugin(echo_simulator) +target_sources(echo_simulator PRIVATE + backend_simulator.cpp ) -qt_disable_warnings(echo_simulator) -#### Keys ignored in scope 1:.:.:backend_simulator.pro:<TRUE>: -# QFACE_FORMAT = "backend_simulator" -# QFACE_SOURCES = "../../../org.example.echo.qface" -# TEMPLATE = "lib" +# IVI Generator: +qt6_ivigenerator(echo_simulator + QFACE_SOURCES ../../../org.example.echo.qface + QFACE_FORMAT backend_simulator +) -qt_autogen_tools_initial_setup(echo_simulator) +target_link_libraries(echo_simulator PUBLIC + echo_frontend + Qt::Core + Qt::Gui + Qt::IviCore +) diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo/frontend/CMakeLists.txt b/tests/auto/core/ivigenerator/projects/org-example-echo/frontend/CMakeLists.txt index c1ec8bb..6b2f7a8 100644 --- a/tests/auto/core/ivigenerator/projects/org-example-echo/frontend/CMakeLists.txt +++ b/tests/auto/core/ivigenerator/projects/org-example-echo/frontend/CMakeLists.txt @@ -1,28 +1,26 @@ # Generated from frontend.pro. +set(CMAKE_INCLUDE_CURRENT_DIR ON) -##################################################################### -## echo_frontend Generic Library: -##################################################################### +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) +set(CMAKE_AUTOUIC ON) -qt_add_cmake_library(echo_frontend - OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" - DEFINES - QT_BUILD_ORG_EXAMPLE_ECHO_LIB - PUBLIC_LIBRARIES - Qt::Core - Qt::Gui - Qt::IviCore - Qt::IviCorePrivate - Qt::Qml - Qt::Quick -) - -#### Keys ignored in scope 1:.:.:frontend.pro:<TRUE>: -# QFACE_SOURCES = "../../../org.example.echo.qface" -# TEMPLATE = "lib" +add_library(echo_frontend) -## Scopes: -##################################################################### +# IVI Generator: +qt6_ivigenerator(echo_frontend + QFACE_SOURCES ../../../org.example.echo.qface + QFACE_FORMAT frontend +) +target_include_directories(echo_frontend PUBLIC + ${CMAKE_CURRENT_BINARY_DIR} +) -#### Keys ignored in scope 2:.:.:frontend.pro:MACOS: -# QMAKE_SONAME_PREFIX = "@rpath" +target_link_libraries(echo_frontend PUBLIC + Qt::Core + Qt::Gui + Qt::IviCore + Qt::IviCorePrivate + Qt::Qml + Qt::Quick +) diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo/qmlplugin/.prev_CMakeLists.txt b/tests/auto/core/ivigenerator/projects/org-example-echo/qmlplugin/.prev_CMakeLists.txt new file mode 100644 index 0000000..4ca67e8 --- /dev/null +++ b/tests/auto/core/ivigenerator/projects/org-example-echo/qmlplugin/.prev_CMakeLists.txt @@ -0,0 +1,45 @@ +# Generated from qmlplugin.pro. + +cmake_minimum_required(VERSION 3.14) +project(qmlplugin 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}") + +find_package(Qt6 COMPONENTS IviCore) +find_package(Qt6 COMPONENTS IviVehicleFunctions) + + +# IVI Generator: +qt6_ivigenerator(qmlplugin + QFACE_SOURCES ../../../org.example.echo.qface + QFACE_FORMAT qmlplugin +) +set_target_properties(qmlplugin PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) +target_include_directories(qmlplugin PUBLIC + ${CMAKE_CURRENT_BINARY_DIR}/../frontend +) + +target_link_libraries(qmlplugin PUBLIC + # Remove: L${CMAKE_CURRENT_BINARY_DIR}/.. + Qt::IviCore + Qt::IviVehicleFunctions +) + +install(TARGETS qmlplugin + RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" + BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" +) diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo/qmlplugin/CMakeLists.txt b/tests/auto/core/ivigenerator/projects/org-example-echo/qmlplugin/CMakeLists.txt index 89be1a8..8cedb00 100644 --- a/tests/auto/core/ivigenerator/projects/org-example-echo/qmlplugin/CMakeLists.txt +++ b/tests/auto/core/ivigenerator/projects/org-example-echo/qmlplugin/CMakeLists.txt @@ -1,22 +1,18 @@ # Generated from qmlplugin.pro. +set(CMAKE_INCLUDE_CURRENT_DIR ON) -##################################################################### -## qmlplugin Generic Library: -##################################################################### +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) +set(CMAKE_AUTOUIC ON) -qt_add_cmake_library(qmlplugin - MODULE - INCLUDE_DIRECTORIES - ${CMAKE_CURRENT_BINARY_DIR}/../frontend - PUBLIC_LIBRARIES - # Remove: L${CMAKE_CURRENT_BINARY_DIR}/.. - Qt::IviCore - ivivehiclefunctions +# IVI Generator: +qt6_ivigenerator(echo_frontend_qmlplugin # special case + QFACE_SOURCES ../../../org.example.echo.qface + QFACE_FORMAT qmlplugin ) -#### Keys ignored in scope 1:.:.:qmlplugin.pro:<TRUE>: -# QFACE_FORMAT = "qmlplugin" -# QFACE_SOURCES = "../../../org.example.echo.qface" -# TEMPLATE = "lib" - -qt_autogen_tools_initial_setup(qmlplugin) +target_link_libraries(echo_frontend_qmlplugin PRIVATE # special case + echo_frontend + Qt::IviCore + Qt::IviVehicleFunctions +) diff --git a/tests/auto/core/ivigenerator/projects/org-example-echo/test/CMakeLists.txt b/tests/auto/core/ivigenerator/projects/org-example-echo/test/CMakeLists.txt index d27a2c8..ea42d2d 100644 --- a/tests/auto/core/ivigenerator/projects/org-example-echo/test/CMakeLists.txt +++ b/tests/auto/core/ivigenerator/projects/org-example-echo/test/CMakeLists.txt @@ -1,21 +1,26 @@ # Generated from test.pro. +set(CMAKE_INCLUDE_CURRENT_DIR ON) -##################################################################### -## tst_org-example-echo Test: -##################################################################### +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) +set(CMAKE_AUTOUIC ON) -qt_add_test(tst_org-example-echo - OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../" - INCLUDE_DIRECTORIES - ${CMAKE_CURRENT_BINARY_DIR}/../frontend - PUBLIC_LIBRARIES - # Remove: L${CMAKE_CURRENT_BINARY_DIR}/.. - Qt::Gui - Qt::IviCore +qt_add_executable(tst_org-example-echo) + +# IVI Generator: +qt6_ivigenerator(tst_org-example-echo + QFACE_SOURCES ../../../org.example.echo.qface + QFACE_FORMAT test +) +set_target_properties(tst_org-example-echo PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE ) -#### Keys ignored in scope 1:.:.:test.pro:<TRUE>: -# QFACE_FORMAT = "test" -# QFACE_SOURCES = "../../../org.example.echo.qface" -# QMAKE_PROJECT_NAME = "$$TARGET" -# QMAKE_RPATHDIR = "$$OUT_PWD/.." +target_link_libraries(tst_org-example-echo PUBLIC + echo_frontend + Qt::Core + Qt::Gui + Qt::IviCore + Qt::Test +) |