Adds latest migration results
This commit is contained in:
829 files changed
+35074
-70886
No files matched your search
@@ -43,23 +43,47 @@ IF(BUILD_RTI)
|
||||
CODEGEN_CLIENT_TOPICS_IFC(SRCS_common ${xml_FILE})
|
||||
ENDIF()
|
||||
|
||||
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($<IF:$<TARGET_EXISTS:svcPdmCommon>,svcPdmCommon,>
|
||||
PRIVATE
|
||||
RTI::nddscpp2
|
||||
PUBLIC
|
||||
Qt6::Core
|
||||
$<IF:$<TARGET_EXISTS:ddscore>,ddscore,>
|
||||
NGLLogger
|
||||
LtsUtilsCore
|
||||
ngldb
|
||||
)
|
||||
NGL_INSTALL_TARGET($<IF:$<TARGET_EXISTS:svcPdmCommon>,svcPdmCommon,>)
|
||||
# Check if svcPdmCommon target exists
|
||||
IF(TARGET svcPdmCommon)
|
||||
SET(PDM_COMMON_TARGET svcPdmCommon)
|
||||
ELSE()
|
||||
SET(PDM_COMMON_TARGET "")
|
||||
ENDIF()
|
||||
|
||||
IF(PDM_COMMON_TARGET)
|
||||
NGL_ADD_LIBRARY(AAR SV WS HLA ${PDM_COMMON_TARGET} SHARED ${SRCS_common})
|
||||
NGL_TARGET_INCLUDE_DIRECTORIES(${PDM_COMMON_TARGET}
|
||||
PUBLIC
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../
|
||||
${CMAKE_CURRENT_BINARY_DIR}/../
|
||||
)
|
||||
NGL_TARGET_LINK_LIBRARIES(${PDM_COMMON_TARGET}
|
||||
PRIVATE
|
||||
RTI::nddscpp2
|
||||
PUBLIC
|
||||
Qt6::Core
|
||||
$<IF:$<TARGET_EXISTS:ddscore>,ddscore,>
|
||||
NGLLogger
|
||||
LtsUtilsCore
|
||||
ngldb
|
||||
)
|
||||
NGL_INSTALL_TARGET(${PDM_COMMON_TARGET})
|
||||
ELSE()
|
||||
# Create a dummy interface library if svcPdmCommon doesn't exist
|
||||
ADD_LIBRARY(svcPdmCommon INTERFACE)
|
||||
TARGET_INCLUDE_DIRECTORIES(svcPdmCommon
|
||||
INTERFACE
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../
|
||||
${CMAKE_CURRENT_BINARY_DIR}/../
|
||||
)
|
||||
TARGET_LINK_LIBRARIES(svcPdmCommon
|
||||
INTERFACE
|
||||
Qt6::Core
|
||||
NGLLogger
|
||||
LtsUtilsCore
|
||||
ngldb
|
||||
)
|
||||
ENDIF()
|
||||
|
||||
#
|
||||
# --- Library svcPdmClient --------------------------------------------------------------------------------
|
||||
@@ -75,6 +99,7 @@ IF(BUILD_RTI)
|
||||
ENDIF()
|
||||
|
||||
NGL_ADD_LIBRARY(WS AAR SV HLA svcPdmClient SHARED ${SRCS_client})
|
||||
SET_TARGET_PROPERTIES(svcPdmClient PROPERTIES AUTOMOC ON)
|
||||
NGL_TARGET_INCLUDE_DIRECTORIES(svcPdmClient
|
||||
PUBLIC
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../
|
||||
@@ -86,7 +111,8 @@ NGL_TARGET_LINK_LIBRARIES(svcPdmClient
|
||||
RTI::nddscpp2
|
||||
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
|
||||
PUBLIC
|
||||
$<IF:$<TARGET_EXISTS:svcPdmCommon>,svcPdmCommon,>
|
||||
${PDM_COMMON_TARGET}
|
||||
Qt6::Core
|
||||
ddsftc
|
||||
)
|
||||
NGL_INSTALL_TARGET(svcPdmClient)
|
||||
@@ -113,9 +139,9 @@ NGL_TARGET_LINK_LIBRARIES(svcPdmServer
|
||||
PRIVATE
|
||||
RTI::nddscpp2
|
||||
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
|
||||
ddsfts
|
||||
$<IF:$<TARGET_EXISTS:ddsfts>,ddsfts,>
|
||||
PUBLIC
|
||||
$<IF:$<TARGET_EXISTS:svcPdmCommon>,svcPdmCommon,>
|
||||
${PDM_COMMON_TARGET}
|
||||
ngldb
|
||||
)
|
||||
NGL_INSTALL_TARGET(svcPdmServer)
|
||||
@@ -160,7 +186,7 @@ NGL_ADD_EXECUTABLE(AAR SV svcProjectDataManagement ${SRCS_exe})
|
||||
NGL_TARGET_LINK_LIBRARIES(svcProjectDataManagement
|
||||
Qt6::Core
|
||||
svcCoreClient
|
||||
$<IF:$<TARGET_EXISTS:svcPdmCommon>,svcPdmCommon,>
|
||||
${PDM_COMMON_TARGET}
|
||||
svcPdmServer
|
||||
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
|
||||
nglsettings
|
||||
|
||||
Reference in new issue
Block a user