torstenandCopilot
b774f4035c
- NGL_ADD_LIBRARY2: 87 CMakeLists.txt konvertiert für Export-Header Generierung - 44 Export-Header Include-Pfade korrigiert (_export.h) - 81 DDS-Stub-Header generiert (*_dtc.h, *_fts.h, *_dts.h, *_ftc.h) - INGLLogger: Duplikat gelöscht, m_logger Member entfernt, variadische Makros - Q_FUNC_INFO Redefinition behoben (Qt6 definiert bereits) - FATAL_LOG Makro hinzugefügt - InfrastructureManagement DDS-Stubs (ism.hpp, ism_enums.hpp, ism_ftc.h) - FilterManagement DDS-Stubs (flt_ftc.h, flt_dts.h) - AreaEffectSimulation DDS-Stubs (aes.hpp, aes_enums.hpp) - SymbolAppearance Klasse vollständig definiert mit content() Methode - BuildingComponentFilter Klasse definiert mit Copy-Konstruktor - Ftc Factory: nullptr Return (abstract class) - AesFilter Klasse in aes.hpp hinzugefügt - Dtc Klasse in ppm.hpp mit participantChanged Signal - AesType Enum: alle 15 At* Werte definiert - AesEffectState_def: EsReceived hinzugefügt - DataModification Enum: eAdded/eModified/eRemoved - function_reply_object.h → core_types.h Include-Pfad (72 Dateien) - Enum-Class-Streaming Template-Operator in INGLLogger.h - ism_mounting_point.h: QImage → QtGui/QImage, QGuiApplication/QScreen - ism_data_plugin_interface.h: QSet Include, Include-Reihenfolge - QRegExp → QRegularExpression in tpm_js_parser.cpp - .underlying() Aufrufe zu direktem Enum-Vergleich korrigiert - Include-Pfade: aes.hpp in symbol_appearance_settings_impl.h und aes_display_filter_impl.h Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
167 lines
3.4 KiB
CMake
Executable File
167 lines
3.4 KiB
CMake
Executable File
#
|
|
# $Id$
|
|
# $HeadURL$
|
|
# $Author$
|
|
#
|
|
|
|
INCLUDE(MacroRTIDDSGen)
|
|
INCLUDE(MacroCodeGenIdl)
|
|
|
|
SET(xml_FILE msg_service.xml)
|
|
|
|
#
|
|
# --- Library svcMsgCommon --------------------------------------------------------------------------------
|
|
#
|
|
SET(SRCS_common
|
|
msg_export.h
|
|
logger.cpp
|
|
logger.h
|
|
)
|
|
|
|
# Generate msg_enums.idl / msg.idl
|
|
CODEGEN_IDL_SVC(SRCS_common ${xml_FILE})
|
|
# Generate msg_db_impl.cpp/.h, msg_db.h
|
|
CODEGEN_DATABASE(SRCS_common ${xml_FILE})
|
|
|
|
# Generate *.cpp/*.hpp from idl
|
|
RTIDDSGEN(SRCS_common msg_enums.idl)
|
|
RTIDDSGEN(SRCS_common msg.idl)
|
|
|
|
# Generate msg_dt[s,c]_types.h, msg_ft[s,c]_types.h
|
|
CODEGEN_TOPIC_TYPEDEFS(SRCS_common ${xml_FILE})
|
|
# generate msg_[d|f]tc.h
|
|
CODEGEN_CLIENT_TOPICS_IFC(SRCS_common ${xml_FILE})
|
|
|
|
NGL_ADD_LIBRARY2(AAR SV WS svcMsgCommon SHARED ${SRCS_common})
|
|
NGL_TARGET_INCLUDE_DIRECTORIES(svcMsgCommon
|
|
PUBLIC
|
|
${CMAKE_CURRENT_SOURCE_DIR}/../
|
|
${CMAKE_CURRENT_BINARY_DIR}/../
|
|
)
|
|
IF(BUILD_RTI)
|
|
NGL_TARGET_LINK_LIBRARIES(svcMsgCommon
|
|
PRIVATE
|
|
RTI::nddscpp2
|
|
PUBLIC
|
|
Qt6::Core
|
|
ddscore
|
|
ngldb
|
|
LtsCommandLineParser
|
|
NGLLogger
|
|
)
|
|
ENDIF(BUILD_RTI)
|
|
NGL_INSTALL_TARGET(svcMsgCommon)
|
|
|
|
#
|
|
# --- Library svcMsgClient --------------------------------------------------------------------------------
|
|
#
|
|
SET(SRCS_client
|
|
msg_export.h
|
|
)
|
|
# generate msg_[d|f]tc_impl.[cpp|h]
|
|
CODEGEN_CLIENT_TOPICS_IMPL(SRCS_client ${xml_FILE})
|
|
|
|
NGL_ADD_LIBRARY2(AAR SV WS svcMsgClient SHARED ${SRCS_client})
|
|
NGL_TARGET_INCLUDE_DIRECTORIES(svcMsgClient
|
|
PUBLIC
|
|
${CMAKE_CURRENT_SOURCE_DIR}/../
|
|
${CMAKE_CURRENT_BINARY_DIR}/../
|
|
)
|
|
|
|
IF(BUILD_RTI)
|
|
NGL_TARGET_LINK_LIBRARIES(svcMsgClient
|
|
PRIVATE
|
|
RTI::nddscpp2
|
|
ddsconnector
|
|
PUBLIC
|
|
svcMsgCommon
|
|
ddsftc
|
|
)
|
|
ENDIF(BUILD_RTI)
|
|
NGL_INSTALL_TARGET(svcMsgClient)
|
|
|
|
#
|
|
# --- Library svcMsgServer --------------------------------------------------------------------------------
|
|
#
|
|
SET(SRCS_server
|
|
msg_export.h
|
|
)
|
|
# generate msg_[d|f]ts.h, msg_[d|f]ts_impl.[cpp|h]
|
|
CODEGEN_SERVER_TOPICS(SRCS_server ${xml_FILE})
|
|
|
|
NGL_ADD_LIBRARY2(AAR SV svcMsgServer SHARED ${SRCS_server})
|
|
NGL_TARGET_INCLUDE_DIRECTORIES(svcMsgServer
|
|
PUBLIC
|
|
${CMAKE_CURRENT_SOURCE_DIR}/../
|
|
${CMAKE_CURRENT_BINARY_DIR}/../
|
|
)
|
|
|
|
IF(BUILD_RTI)
|
|
NGL_TARGET_LINK_LIBRARIES(svcMsgServer
|
|
PRIVATE
|
|
RTI::nddscpp2
|
|
ddsconnector
|
|
ddsfts
|
|
PUBLIC
|
|
svcMsgCommon
|
|
ngldb
|
|
)
|
|
ENDIF(BUILD_RTI)
|
|
NGL_INSTALL_TARGET(svcMsgServer)
|
|
|
|
#
|
|
# --- Topic Type Plugin --------------------------------------------------------------
|
|
#
|
|
CREATE_TOPIC_TYPE_PLUGIN(${xml_FILE})
|
|
|
|
#
|
|
# --- Executable svcMessaging (sMSG) -------------------------------------------------
|
|
#
|
|
SET(SRCS_exe
|
|
main.cpp
|
|
main_handler.cpp
|
|
main_handler.h
|
|
settings.cpp
|
|
settings.h
|
|
dds_handler.cpp
|
|
dds_handler.h
|
|
exercise_handler.cpp
|
|
exercise_handler.h
|
|
exercises_handler.cpp
|
|
exercises_handler.h
|
|
handler_operator_message.cpp
|
|
handler_operator_message.h
|
|
log4cxx_msg.props
|
|
${xml_FILE}
|
|
)
|
|
|
|
# Generate msg.sql, msg.xml
|
|
CODEGEN_SQL(SRCS_exe ${xml_FILE})
|
|
|
|
NGL_ADD_SVC_ICON(SRCS_exe)
|
|
NGL_ADD_EXECUTABLE(AAR SV svcMessaging ${SRCS_exe})
|
|
NGL_TARGET_LINK_LIBRARIES(svcMessaging
|
|
Qt6::Core
|
|
svcMsgCommon
|
|
svcMsgServer
|
|
svcTabClient
|
|
svcOpmClient
|
|
svcOssClient
|
|
svcPpmClient
|
|
svcCoreClient
|
|
ddsconnector
|
|
nglsettings
|
|
ProjectConfig
|
|
NGLLogger
|
|
nglcoreapplication
|
|
ngltools
|
|
)
|
|
NGL_INSTALL_TARGET(svcMessaging)
|
|
NGL_INSTALL(AAR SV FILES log4cxx_msg.props DESTINATION bin)
|
|
NGL_ADD_TARGET_LINK(svcMessaging sMSG)
|
|
|
|
# Uncomment if necessary
|
|
#ADD_SUBDIRECTORY(UnitTests)
|
|
ADD_SUBDIRECTORY(ModuleTests)
|
|
|