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>
132 lines
3.3 KiB
CMake
Executable File
132 lines
3.3 KiB
CMake
Executable File
#
|
|
# $Id$
|
|
# $HeadURL$
|
|
# $Author$
|
|
#
|
|
|
|
IF(BUILD_TESTING AND BUILD_RTI AND TARGET ddsgen AND TARGET ddsdtc AND TARGET ddsfts AND TARGET ddsQoS)
|
|
|
|
SET(xml_FILE ddsut.xml)
|
|
|
|
SET(SRCS_common
|
|
ddsut_export.h
|
|
)
|
|
# Generates ddsut.idl / ddsut_enums.idl
|
|
CODEGEN_IDL_SVC(SRCS_common ${xml_FILE})
|
|
# Generate *.cpp/*.hpp from ddsut_enums.idl / ddsut.idl
|
|
RTIDDSGEN(SRCS_common ddsut_enums.idl)
|
|
RTIDDSGEN(SRCS_common ddsut.idl)
|
|
# Generate ddsut_dt[s,c]_types.h, ddsut_ft[s,c]_types.h
|
|
CODEGEN_TOPIC_TYPEDEFS(SRCS_common ${xml_FILE})
|
|
# generate ddsut_[d|f]tc.h
|
|
CODEGEN_CLIENT_TOPICS_IFC(SRCS_common ${xml_FILE})
|
|
|
|
NGL_ADD_LIBRARY2(ALL ddsut_common SHARED ${SRCS_common})
|
|
IF(BUILD_RTI)
|
|
NGL_TARGET_LINK_LIBRARIES(ddsut_common
|
|
PRIVATE
|
|
NGLLogger
|
|
PUBLIC
|
|
LtsUtilsCoreHeaderOnly
|
|
Qt6::Core
|
|
RTI::nddsc
|
|
RTI::nddscore
|
|
RTI::nddscpp2
|
|
ddscore
|
|
)
|
|
ENDIF(BUILD_RTI)
|
|
NGL_TARGET_INCLUDE_DIRECTORIES(ddsut_common
|
|
PUBLIC
|
|
${CMAKE_CURRENT_SOURCE_DIR}/../
|
|
${CMAKE_CURRENT_BINARY_DIR}/../
|
|
)
|
|
|
|
# -----------------------------------------------------------------------------------
|
|
# Testing DataWriter/DataReader without DTS/DTC
|
|
# -----------------------------------------------------------------------------------
|
|
SET(SRCS_TEST1
|
|
generic_data_tests.cpp
|
|
generic_data_tests.h
|
|
initialisation.cpp
|
|
initialisation.h
|
|
)
|
|
|
|
# -----------------------------------------------------------------------------------
|
|
# Testing DataTopic Functionality (DTS/DTC)
|
|
# -----------------------------------------------------------------------------------
|
|
SET(SRCS_TEST2
|
|
data_topic_tests_main.cpp
|
|
data_topic_tests_main.h
|
|
data_topic_tests.cpp
|
|
data_topic_tests.h
|
|
)
|
|
|
|
# -----------------------------------------------------------------------------------
|
|
# Testing FunctionTopic Functionality (FTS/FTC)
|
|
# -----------------------------------------------------------------------------------
|
|
SET(SRCS_TEST3
|
|
function_topic_tests.cpp
|
|
function_topic_tests.h
|
|
)
|
|
|
|
|
|
# Testing DataWriter/DataReader without DTS/DTC
|
|
ADD_EXECUTABLE(ddsGenericDataTests ${SRCS_TEST1})
|
|
TARGET_LINK_LIBRARIES(ddsGenericDataTests
|
|
ddsgen
|
|
ddsdtc
|
|
ddsQoS
|
|
nglcoreapplication
|
|
NGLLogger
|
|
ProjectConfig
|
|
Qt6::Core
|
|
Qt6::Test
|
|
ddsut_common
|
|
)
|
|
ADD_TEST(NAME ddsGenericDataTests COMMAND $<TARGET_FILE:ddsGenericDataTests>)
|
|
|
|
# Testing DataTopic Functionality (DTS/DTC)
|
|
ADD_EXECUTABLE(ddsDataTopicTests ${SRCS_TEST2})
|
|
TARGET_LINK_LIBRARIES(ddsDataTopicTests
|
|
nglcoreapplication
|
|
NGLLogger
|
|
RTI::nddscpp2
|
|
ddsgen
|
|
ddsdts
|
|
ddsdtc
|
|
ddsQoS
|
|
ProjectConfig
|
|
Qt6::Core
|
|
Qt6::Test
|
|
ddsut_common
|
|
)
|
|
ADD_TEST(NAME ddsDataTopicTests COMMAND $<TARGET_FILE:ddsDataTopicTests>)
|
|
|
|
# Testing FunctionTopic Functionality (FTS/FTC)
|
|
ADD_EXECUTABLE(ddsFunctionTopicTests ${SRCS_TEST3})
|
|
TARGET_LINK_LIBRARIES(ddsFunctionTopicTests
|
|
ddsgen
|
|
ddsfts
|
|
ddsftc
|
|
ddsQoS
|
|
ddsconnector
|
|
nglcoreapplication
|
|
NGLLogger
|
|
ngltools
|
|
Qt6::Core
|
|
Qt6::Test
|
|
ddsut_common
|
|
)
|
|
ADD_TEST(NAME ddsFunctionTopicTests COMMAND $<TARGET_FILE:ddsFunctionTopicTests>)
|
|
|
|
IF(NOT BUILD_RPM)
|
|
NGL_INSTALL(AAR SV TARGETS ddsut_common DESTINATION bin/test)
|
|
NGL_INSTALL(AAR SV TARGETS ddsGenericDataTests DESTINATION bin/test)
|
|
NGL_INSTALL(AAR SV TARGETS ddsDataTopicTests DESTINATION bin/test)
|
|
NGL_INSTALL(AAR SV TARGETS ddsFunctionTopicTests DESTINATION bin/test)
|
|
|
|
NGL_INSTALL(AAR SV FILES log4cxx_ddsUnitTests.props DESTINATION bin/test)
|
|
ENDIF()
|
|
ENDIF()
|
|
|