Adds latest migration results
This commit is contained in:
829 files changed
+35074
-70886
No files matched your search
@@ -4,6 +4,21 @@
|
||||
# $Author$
|
||||
#
|
||||
|
||||
# Make ${Qt6_Gui} optional
|
||||
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Gui)
|
||||
set(Qt6_Gui ${Qt6_Gui})
|
||||
else()
|
||||
set(Qt6_Gui "")
|
||||
endif()
|
||||
|
||||
# Make ${Qt6_WebSockets} optional
|
||||
if(QT6_GUI_AVAILABLE AND TARGET Qt6::WebSockets)
|
||||
set(Qt6_WebSockets ${Qt6_WebSockets})
|
||||
else()
|
||||
set(Qt6_WebSockets "")
|
||||
endif()
|
||||
|
||||
|
||||
INCLUDE(MacroRTIDDSGen)
|
||||
INCLUDE(MacroCodeGenIdl)
|
||||
|
||||
@@ -25,16 +40,15 @@ SET(SRCS_common
|
||||
# Generate ppm_enums.idl / ppm.idl
|
||||
IF(BUILD_RTI)
|
||||
CODEGEN_IDL_SVC(SRCS_common ${xml_FILE})
|
||||
# Generate *.cpp/*.hpp from idl
|
||||
RTIDDSGEN(SRCS_common ppm_enums.idl)
|
||||
RTIDDSGEN(SRCS_common ppm.idl)
|
||||
ENDIF()
|
||||
# Generate ppm_db_structs.cpp/.h
|
||||
CODEGEN_DATABASE_STRUCTS(SRCS_common ${xml_FILE})
|
||||
# Generate ppm_db.cpp, ppm_db_impl.cpp/.h
|
||||
CODEGEN_DATABASE_SQL(SRCS_common ${xml_FILE})
|
||||
|
||||
# Generate *.cpp/*.hpp from idl
|
||||
RTIDDSGEN(SRCS_common ppm_enums.idl)
|
||||
RTIDDSGEN(SRCS_common ppm.idl)
|
||||
|
||||
# Generate ppm_dt[s,c]_types.h, ppm_ft[s,c]_types.h
|
||||
IF(BUILD_RTI)
|
||||
CODEGEN_TOPIC_TYPEDEFS(SRCS_common ${xml_FILE})
|
||||
@@ -50,20 +64,22 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcPpmCommon
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../
|
||||
${CMAKE_CURRENT_BINARY_DIR}/../
|
||||
)
|
||||
NGL_TARGET_LINK_LIBRARIES(svcPpmCommon
|
||||
PRIVATE
|
||||
RTI::nddscpp2
|
||||
LtsUtilsCore
|
||||
PUBLIC
|
||||
Qt6::Core
|
||||
Qt6::Gui
|
||||
$<IF:$<TARGET_EXISTS:ddscore>,ddscore,>
|
||||
NGLLogger
|
||||
$<IF:$<TARGET_EXISTS:svcPdmCommon>,svcPdmCommon,>
|
||||
LtsUtilsCore
|
||||
LtsCoordTrans
|
||||
ngldb
|
||||
)
|
||||
if(QT6_GUI_AVAILABLE)
|
||||
NGL_TARGET_LINK_LIBRARIES(svcPpmCommon
|
||||
PRIVATE
|
||||
RTI::nddscpp2
|
||||
LtsUtilsCore
|
||||
PUBLIC
|
||||
Qt6::Core
|
||||
${Qt6_Gui}
|
||||
$<IF:$<TARGET_EXISTS:ddscore>,ddscore,>
|
||||
NGLLogger
|
||||
$<IF:$<TARGET_EXISTS:svcPdmCommon>,svcPdmCommon,>
|
||||
LtsUtilsCore
|
||||
LtsCoordTrans
|
||||
ngldb
|
||||
)
|
||||
endif()
|
||||
NGL_INSTALL_TARGET(svcPpmCommon)
|
||||
|
||||
#
|
||||
@@ -165,7 +181,7 @@ IF (TARGET ppmRecordReplayPlugin)
|
||||
)
|
||||
TARGET_LINK_LIBRARIES(ppmRecordReplayPlugin
|
||||
Qt6::Concurrent
|
||||
Qt6::WebSockets
|
||||
${Qt6_WebSockets}
|
||||
tabRecordReplayPlugin
|
||||
svcBldClient
|
||||
svcPpmServer
|
||||
@@ -278,7 +294,7 @@ NGL_TARGET_LINK_LIBRARIES(svcParticipantManagement
|
||||
ppmRecordReplayPlugin
|
||||
Qt6::Core
|
||||
Qt6::Concurrent
|
||||
Qt6::WebSockets
|
||||
${Qt6_WebSockets}
|
||||
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
|
||||
LtsCommandLineParser
|
||||
nglsettings
|
||||
|
||||
Reference in new issue
Block a user