diff options
Diffstat (limited to 'src/tools/ivigenerator')
5 files changed, 50 insertions, 15 deletions
diff --git a/src/tools/ivigenerator/templates/backend_qtro/CMakeLists.txt.tpl b/src/tools/ivigenerator/templates/backend_qtro/CMakeLists.txt.tpl index f72276c..e1fbcd2 100644 --- a/src/tools/ivigenerator/templates/backend_qtro/CMakeLists.txt.tpl +++ b/src/tools/ivigenerator/templates/backend_qtro/CMakeLists.txt.tpl @@ -1,4 +1,6 @@ -find_package(Qt6 COMPONENTS RemoteObjects IviRemoteObjectsHelper) +if (NOT TARGET Qt6::RemoteObjects OR NOT TARGET Qt6::IviRemoteObjectsHelper) + find_package(Qt6 COMPONENTS RemoteObjects IviRemoteObjectsHelper) +endif() target_sources(${CURRENT_TARGET} PRIVATE @@ -8,12 +10,17 @@ target_sources(${CURRENT_TARGET} {{module.module_name|lower}}qtroplugin.cpp ) -qt_add_repc_replica(${CURRENT_TARGET} +qt6_add_repc_replica(${CURRENT_TARGET} {% for interface in module.interfaces %} - {{interface|lower}}.rep + ${CMAKE_CURRENT_BINARY_DIR}/{{interface|lower}}.rep {% endfor %} ) +target_link_libraries(${CURRENT_TARGET} PRIVATE + Qt6::RemoteObjects + Qt6::IviRemoteObjectsHelper +) + ### MISSING # OTHER_FILES += \ # $$PWD/{{module.module_name|lower}}.json diff --git a/src/tools/ivigenerator/templates/backend_qtro/pagingmodel.cpp.tpl b/src/tools/ivigenerator/templates/backend_qtro/pagingmodel.cpp.tpl index b9e7558..69be2a2 100644 --- a/src/tools/ivigenerator/templates/backend_qtro/pagingmodel.cpp.tpl +++ b/src/tools/ivigenerator/templates/backend_qtro/pagingmodel.cpp.tpl @@ -47,8 +47,8 @@ Q_LOGGING_CATEGORY(qLcRO{{interface}}{{property|upper_first}}, "{{module|qml_typ {{class}}::{{class}}(const QString &remoteObjectsLookupName, QObject* parent) : QIviPagingModelInterface(parent) - , m_node(nullptr) , m_helper(new QIviRemoteObjectReplicaHelper(qLcRO{{interface}}{{property|upper_first}}(), this)) + , m_node(nullptr) , m_remoteObjectsLookupName(remoteObjectsLookupName) { qRegisterMetaType<QIviPagingModelInterface*>(); diff --git a/src/tools/ivigenerator/templates/backend_simulator/CMakeLists.txt.tpl b/src/tools/ivigenerator/templates/backend_simulator/CMakeLists.txt.tpl index 843a3f4..93cad4a 100644 --- a/src/tools/ivigenerator/templates/backend_simulator/CMakeLists.txt.tpl +++ b/src/tools/ivigenerator/templates/backend_simulator/CMakeLists.txt.tpl @@ -1,5 +1,4 @@ -target_sources(${CURRENT_TARGET} - PRIVATE +set(${CURRENT_TARGET}_SOURCES {% for interface in module.interfaces %} {{interface|lower}}backend.cpp {% endfor %} @@ -7,6 +6,15 @@ target_sources(${CURRENT_TARGET} {{module.module_name|lower}}_simulation.qrc ) +qt_add_resources(${CURRENT_TARGET}_SOURCES + ${CMAKE_CURRENT_BINARY_DIR}/{{module.module_name|lower}}_simulation.qrc +) + +target_sources(${CURRENT_TARGET} + PRIVATE + ${${CURRENT_TARGET}_SOURCES} +) + ### MISSING # OTHER_FILES += \ # $$PWD/{{module.module_name|lower}}.json \ diff --git a/src/tools/ivigenerator/templates/server_qtro/CMakeLists.txt.tpl b/src/tools/ivigenerator/templates/server_qtro/CMakeLists.txt.tpl index 963d7aa..151d979 100644 --- a/src/tools/ivigenerator/templates/server_qtro/CMakeLists.txt.tpl +++ b/src/tools/ivigenerator/templates/server_qtro/CMakeLists.txt.tpl @@ -1,13 +1,19 @@ -find_package(Qt6 COMPONENTS RemoteObjects) +if (NOT TARGET Qt6::RemoteObjects OR NOT TARGET Qt6::IviRemoteObjectsHelper) + find_package(Qt6 COMPONENTS RemoteObjects IviRemoteObjectsHelper) +endif() target_sources(${CURRENT_TARGET} PRIVATE core.cpp ) -qt_add_repc_source(${CURRENT_TARGET} +qt6_add_repc_source(${CURRENT_TARGET} {% for interface in module.interfaces %} - {{interface|lower}}.rep + ${CMAKE_CURRENT_BINARY_DIR}/{{interface|lower}}.rep {% endfor %} ) +target_link_libraries(${CURRENT_TARGET} PRIVATE + Qt6::RemoteObjects + Qt6::IviRemoteObjectsHelper +) diff --git a/src/tools/ivigenerator/templates/server_qtro_simulator/CMakeLists.txt.tpl b/src/tools/ivigenerator/templates/server_qtro_simulator/CMakeLists.txt.tpl index 7398ad1..d48f2b8 100644 --- a/src/tools/ivigenerator/templates/server_qtro_simulator/CMakeLists.txt.tpl +++ b/src/tools/ivigenerator/templates/server_qtro_simulator/CMakeLists.txt.tpl @@ -1,22 +1,36 @@ -find_package(Qt6 COMPONENTS RemoteObjects IviRemoteObjectsHelper) +if (NOT TARGET Qt6::RemoteObjects OR NOT TARGET Qt6::IviRemoteObjectsHelper) + find_package(Qt6 COMPONENTS RemoteObjects IviRemoteObjectsHelper) +endif() -target_sources(${CURRENT_TARGET} - PRIVATE +set(${CURRENT_TARGET}_SOURCES {% for interface in module.interfaces %} {{interface|lower}}backend.cpp {{interface|lower}}adapter.cpp {% endfor %} core.cpp main.cpp - {{module.module_name|lower}}_simulation.qrc ) -qt_add_repc_source(${CURRENT_TARGET} +qt_add_resources(${CURRENT_TARGET}_SOURCES + ${CMAKE_CURRENT_BINARY_DIR}/{{module.module_name|lower}}_simulation.qrc +) + +target_sources(${CURRENT_TARGET} + PRIVATE + ${${CURRENT_TARGET}_SOURCES} +) + +qt6_add_repc_source(${CURRENT_TARGET} {% for interface in module.interfaces %} - {{interface|lower}}.rep + ${CMAKE_CURRENT_BINARY_DIR}/{{interface|lower}}.rep {% endfor %} ) +target_link_libraries(${CURRENT_TARGET} PRIVATE + Qt6::RemoteObjects + Qt6::IviRemoteObjectsHelper +) + ### MISSING # OTHER_FILES += \ # $$PWD/{{module.module_name|lower}}.json \ |