1 files changed, 9 insertions, 3 deletions
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
+)