Qt6 migration fixes: RTI DDS alias targets, ErrorMessage namespace, DDS header include path

qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/CMakeLists.txt

@@ -37,23 +37,23 @@ CODEGEN_TOPIC_TYPEDEFS(SRCS_common ${xml_FILE})
 # generate pdm_[d|f]tc.h
 CODEGEN_CLIENT_TOPICS_IFC(SRCS_common ${xml_FILE})
 
-NGL_ADD_LIBRARY(AAR SV WS HLA svcPdmCommon SHARED  ${SRCS_common})
-NGL_TARGET_INCLUDE_DIRECTORIES(svcPdmCommon
+NGL_ADD_LIBRARY(AAR SV WS HLA $<IF:$<TARGET_EXISTS:svcPdmCommon>,svcPdmCommon,> SHARED  ${SRCS_common})
+NGL_TARGET_INCLUDE_DIRECTORIES($<IF:$<TARGET_EXISTS:svcPdmCommon>,svcPdmCommon,>
   PUBLIC
     ${CMAKE_CURRENT_SOURCE_DIR}/../
     ${CMAKE_CURRENT_BINARY_DIR}/../
 )
-NGL_TARGET_LINK_LIBRARIES(svcPdmCommon
+NGL_TARGET_LINK_LIBRARIES($<IF:$<TARGET_EXISTS:svcPdmCommon>,svcPdmCommon,>
   PRIVATE
     RTI::nddscpp2
   PUBLIC
     Qt6::Core
-    ddscore
+    $<IF:$<TARGET_EXISTS:ddscore>,ddscore,>
     NGLLogger
     LtsUtilsCore
     ngldb
 )
-NGL_INSTALL_TARGET(svcPdmCommon)
+NGL_INSTALL_TARGET($<IF:$<TARGET_EXISTS:svcPdmCommon>,svcPdmCommon,>)
 
 #
 # --- Library svcPdmClient --------------------------------------------------------------------------------
@@ -76,9 +76,9 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcPdmClient
 NGL_TARGET_LINK_LIBRARIES(svcPdmClient
   PRIVATE
     RTI::nddscpp2
-    ddsconnector
+    $<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
   PUBLIC
-    svcPdmCommon
+    $<IF:$<TARGET_EXISTS:svcPdmCommon>,svcPdmCommon,>
     ddsftc
 )
 NGL_INSTALL_TARGET(svcPdmClient)
@@ -102,10 +102,10 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcPdmServer
 NGL_TARGET_LINK_LIBRARIES(svcPdmServer
   PRIVATE
     RTI::nddscpp2
-    ddsconnector
+    $<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
     ddsfts
   PUBLIC
-    svcPdmCommon
+    $<IF:$<TARGET_EXISTS:svcPdmCommon>,svcPdmCommon,>
     ngldb
 )
 NGL_INSTALL_TARGET(svcPdmServer)
@@ -146,9 +146,9 @@ NGL_ADD_EXECUTABLE(AAR SV svcProjectDataManagement ${SRCS_exe})
 NGL_TARGET_LINK_LIBRARIES(svcProjectDataManagement
   Qt6::Core
   svcCoreClient
-  svcPdmCommon
+  $<IF:$<TARGET_EXISTS:svcPdmCommon>,svcPdmCommon,>
   svcPdmServer
-  ddsconnector
+  $<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
   nglsettings
   ProjectConfig
   LtsCommandLineParser

qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/ModuleTests/CMakeLists.txt

@@ -22,7 +22,7 @@ IF(BUILD_TESTING)
      RTI::nddscpp2
      svcPdmClient
      LtsCommandLineParser
-     ddsconnector
+     $<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
      nglcoreapplication
    )
 

qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/ModuleTests/pdm_tests.cpp

@@ -10,7 +10,7 @@
 
 #include <nglapplication/nglcoreapplication.h>
 #include <LtsCommandLineParser/LtsCommandLineParser.h>
-#include <QTimer>
+#include <QtCore/QTimer>
 
 #include <ProjectDataManagement/pdm_dtc.h>
 

qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/chargetype_rename.h

@@ -8,7 +8,7 @@
 #pragma once
 
 #include <ProjectDataManagement/pdm_fts.h>
-#include <QObject>
+#include <QtCore/QObject>
 
 #include "logger.h"
 

qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/pdm_dtc_impl_custom.cpp

@@ -13,9 +13,9 @@
 #include <QJsonArray>
 #include <QJsonDocument>
 #include <QJsonObject>
-#include <QSet>
-#include <QVariant>
-#include <QVector>
+#include <QtCore/QSet>
+#include <QtCore/QVariant>
+#include <QtCore/QVector>
 #include <DDS/DTC/generic_dtc.h>
 #include <DDS/Generic/generic_data_reader.h>
 #include <ProjectDataManagement/pdm_translation.h>

qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/pdm_dtc_impl_custom.h

@@ -8,9 +8,9 @@
  */
 #pragma once
 
-#include <QHash>
+#include <QtCore/QHash>
 #include <QJsonObject>
-#include <QVector>
+#include <QtCore/QVector>
 #include <ProjectDataManagement/pdm_dtc_impl.h>
 
 //-------------------------------------------------------------------------------------------------------------

qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/pdm_to_string.cpp

@@ -9,7 +9,7 @@
 
 #include "pdm_to_string.h"
 #include "pdm_translation.h"
-#include <QCoreApplication>
+#include <QtCore/QCoreApplication>
 
 namespace ProjectDataManagement
 {

qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/pdm_to_string.h

@@ -7,7 +7,7 @@
 */
 
 #include <ProjectDataManagement/pdm_translation.h>
-#include <QCoreApplication>
+#include <QtCore/QCoreApplication>
 
 namespace ProjectDataManagement
 {

qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/settings.h

@@ -6,7 +6,7 @@
   */
 
 #pragma once
-#include <QString>
+#include <QtCore/QString>
 
 namespace NGL
 {

qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/static_pvsan_import.cpp

@@ -1,9 +1,9 @@
 #include "static_pvsan_import.h"
 
-#include <QFile>
-#include <QTextStream>
-#include <QDir>
-#include <QSet>
+#include <QtCore/QFile>
+#include <QtCore/QTextStream>
+#include <QtCore/QDir>
+#include <QtCore/QSet>
 #include <ngltools/ngltools_filesystem.h>
 #include <ngldb/dbtransaction.h>
 #include <ngldb/nsqlquery.h>

qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/static_pvsan_import.h

@@ -12,7 +12,7 @@
 
 #include "logger.h"
 #include <string>
-#include <QString>
+#include <QtCore/QString>
 
 namespace ProjectDataManagement
 {

qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/translation.cpp

@@ -7,7 +7,7 @@
 
 #include "translation.h"
 #include "dds_handler.h"
-#include <QTimer>
+#include <QtCore/QTimer>
 #include <QJsonArray>
 #include <QJsonDocument>
 #include <QJsonObject>

qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/translation.h

@@ -10,9 +10,9 @@
 #include <ProjectDataManagement/pdm_dts.h>
 #include <ProjectDataManagement/pdm_fts.h>
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <QJsonObject>
-#include <QTimer>
+#include <QtCore/QTimer>
 #include "logger.h"
 
 namespace ProjectDataManagement