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

This commit is contained in:
torsten committed 2026-08-27 09:02:26 +02:00
1 parent 8050bca545
commit bb1447c858
18635 files changed
+2466913 -906310

No files matched your search

@@ -36,6 +36,7 @@ CODEGEN_TOPIC_TYPEDEFS(SRCS_common ${xml_FILE})
CODEGEN_CLIENT_TOPICS_IFC(SRCS_common ${xml_FILE})
NGL_ADD_LIBRARY(AAR SV WS HLA svcIsmCommon SHARED ${SRCS_common})
set_target_properties(svcIsmCommon PROPERTIES AUTOMOC ON)
NGL_TARGET_INCLUDE_DIRECTORIES(svcIsmCommon
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../
@@ -46,7 +47,7 @@ NGL_TARGET_LINK_LIBRARIES(svcIsmCommon
RTI::nddscpp2
PUBLIC
Qt6::Core
ddscore
$<IF:$<TARGET_EXISTS:ddscore>,ddscore,>
LtsUtilsCore
ngldb
NGLLogger
@@ -67,6 +68,7 @@ SET(SRCS_client
CODEGEN_CLIENT_TOPICS_IMPL(SRCS_client ${xml_FILE})
NGL_ADD_LIBRARY(AAR SV WS HLA svcIsmClient SHARED ${SRCS_client})
set_target_properties(svcIsmClient PROPERTIES AUTOMOC ON)
NGL_TARGET_INCLUDE_DIRECTORIES(svcIsmClient
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../
@@ -76,7 +78,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcIsmClient
NGL_TARGET_LINK_LIBRARIES(svcIsmClient
PRIVATE
RTI::nddscpp2
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
Qt6::Xml
PUBLIC
svcIsmCommon
@@ -108,7 +110,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcIsmServer
NGL_TARGET_LINK_LIBRARIES(svcIsmServer
PRIVATE
RTI::nddscpp2
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
ddsfts
PUBLIC
svcIsmCommon
@@ -190,7 +192,7 @@ NGL_TARGET_LINK_LIBRARIES(svcInfrastructureManagement
svcCoreClient
svcIsmCommon
svcIsmServer
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
nglsettings
ProjectConfig
LtsCommandLineParser