Migration of Legatus codebase to Qt6 with RTI Connext DDS 7.7 integration is partially complete. Core DDS targets build successfully, but ProjectDataManagement module blocks full ddsfts compilation due to IDL definition conflicts.

qt6-after/qt6-migrated-legatus/Z/src/ngltools/CMakeLists.txt

@@ -26,14 +26,20 @@ NGL_TARGET_LINK_LIBRARIES(ngltools
 
 # Smoke test for ngltools DTG conversion utilities
 IF(BUILD_TESTING)
-  find_package(Qt6 COMPONENTS Test Core QUIET)
-  if (Qt6_FOUND)
+  # Check if Qt6::Test already exists from parent CMakeLists.txt
+  if(TARGET Qt6::Test)
     set(_QTTEST_TARGET Qt6::Test)
     set(_QTCORE_TARGET Qt6::Core)
   else()
-    find_package(Qt6 COMPONENTS Test Core REQUIRED)
-    set(_QTTEST_TARGET Qt6::Test)
-    set(_QTCORE_TARGET Qt6::Core)
+    find_package(Qt6 COMPONENTS Test Core QUIET)
+    if (Qt6_FOUND)
+      set(_QTTEST_TARGET Qt6::Test)
+      set(_QTCORE_TARGET Qt6::Core)
+    else()
+      find_package(Qt6 COMPONENTS Test Core REQUIRED)
+      set(_QTTEST_TARGET Qt6::Test)
+      set(_QTCORE_TARGET Qt6::Core)
+    endif()
   endif()
 
   if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/tests/NGLToolsQtSmokeTest.cpp)

qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/CMakeLists.txt

@@ -88,17 +88,17 @@ endif()
 
 # SV: logView
 NGL_ADD_LIBRARY2(WS AAR SV nglwidgets SHARED ${nglwidgets_SRCS} ${oxygen_SRCS})
-NGL_TARGET_INCLUDE_DIRECTORIES(nglwidgets
-  PRIVATE
-    ${POPPLER_QT6_INCLUDE_DIR}
-)
+if(HAVE_POPPLER_QT6)
+  target_compile_definitions(nglwidgets PRIVATE HAVE_POPPLER_QT6)
+  target_include_directories(nglwidgets PRIVATE ${POPPLER_QT6_INCLUDE_DIRS})
+  target_link_libraries(nglwidgets PRIVATE ${POPPLER_QT6_LIBRARIES})
+endif()
 if(QT6_GUI_AVAILABLE)
   NGL_TARGET_LINK_LIBRARIES(nglwidgets
     PRIVATE
       NGLLogger
       ngltranslator
       ngltools
-      ${POPPLER_QT6_LIBRARY}
     PUBLIC
       Qt6::Core
       ${Qt6_Widgets}

qt6-after/qt6-migrated-legatus/Z/src/nglwidgets/nglpdfpage.h

@@ -36,6 +36,7 @@ public:
 Q_SIGNALS:
   void linkClicked(const Poppler::LinkDestination &dest);
 #endif
+public:
   void setZoomFactor(double zoom);
   void clearPixmap();
   QSize sizeHint() const override;

qt6-after/qt6-migrated-legatus/Z/src/qsql_informix/CMakeLists.txt

@@ -16,10 +16,17 @@ SET(CMAKE_CXX_STANDARD_REQUIRED 11)
 SET(CMAKE_CXX_VISIBILITY_PRESET hidden)
 SET(CMAKE_INCLUDE_CURRENT_DIR ON)
 SET(CMAKE_VISIBILITY_INLINES_HIDDEN ON)
-SET(CMAKE_POSITION_INDEPENDENT_CODE ON)
+# Qt6 Migration: Removed CMAKE_POSITION_INDEPENDENT_CODE - conflicts with Qt6 reduce_relocations
+# SET(CMAKE_POSITION_INDEPENDENT_CODE ON)
 SET(CMAKE_AUTOMOC TRUE)
 SET(QT_USE_IMPORTED_TARGETS TRUE)
-find_package(Qt6 5.9.0 COMPONENTS Core Sql Test Core5Compat REQUIRED)
+
+# Check if Qt6 components already exist from parent CMakeLists.txt
+if(TARGET Qt6::Core AND TARGET Qt6::Sql AND TARGET Qt6::Test)
+  # Already found by parent
+else()
+  find_package(Qt6 5.9.0 COMPONENTS Core Sql Test Core5Compat REQUIRED)
+endif()
 
 FIND_PACKAGE(IClientSDK REQUIRED)