berrux-dev
040bdd558f
Deletes the two stub-header trees (249 files) that shadowed the real
rtiddsgen-generated DDS headers, and removes every reference to them.
CMake (15 include-path entries):
root CMakeLists.txt include_directories(.../forward-declarations);
NGL_TARGET_INCLUDE_DIRECTORIES entries in 7 service CMakeLists
(ServiceManagement, SoundManagement, SituationMap, ScreenRecording,
SituationReplayManagement, SituationReplay, ServiceMonitor)
Source includes that resolved to the root-level stubs (only 2, repointed to the
module-prefixed generated headers the rest of the tree already uses):
Lts/Services/AreaEffectSimulation/object_charge_effect.h
<aes_dtc.h> -> <AreaEffectSimulation/aes_dtc.h>
Lts/Proxies/TrainingAreaBaseOC/websocket_handler.h
<taboc_dtc.h> -> <TrainingAreaBaseOC/taboc_dtc.h>
(generic_dtc_impl.h needs no change: its quote-include "generic_dtc.h"
resolves to the real Lts/DDS/DTC/generic_dtc.h in the same directory)
Tests:
tests/test_migration_stubs.cpp: remove the redundant root-level stub test
(AesDtcCompiles) - the module-prefixed AreaEffectSimulationDtcCompiles test
already exercises the same AreaEffectSimulation::Interface header.
tests/test_skl_dtc.cpp: delete (removed-module compile test, already filtered
out of the build) and remove its now-obsolete CMake list(FILTER) exclusion.
Validation: full rebuild (build4, make -j4 -k) with the removal - 0 new compile
errors vs the pre-existing base-state baseline (77 unique real-error signatures
identical to baseline; all 15 'No such file' headers pre-existing).
178 lines
3.7 KiB
CMake
Executable File
178 lines
3.7 KiB
CMake
Executable File
#
|
|
# $Id$
|
|
# $HeadURL$
|
|
# $Author$
|
|
#
|
|
|
|
INCLUDE(MacroRTIDDSGen)
|
|
INCLUDE(MacroCodeGenIdl)
|
|
|
|
SET(xml_FILE som_service.xml)
|
|
|
|
#
|
|
# --- Library svcSomCommon --------------------------------------------------------------------------------
|
|
#
|
|
SET(SRCS_common
|
|
som_export.h
|
|
logger.cpp
|
|
logger.h
|
|
)
|
|
|
|
# Generate som_enums.idl / som.idl
|
|
IF(BUILD_RTI)
|
|
CODEGEN_IDL_SVC(SRCS_common ${xml_FILE})
|
|
ENDIF()
|
|
# Generate som_db_impl.cpp/.h, som_db.h
|
|
IF(BUILD_RTI)
|
|
CODEGEN_DATABASE(SRCS_common ${xml_FILE})
|
|
ENDIF()
|
|
|
|
# Generate *.cpp/*.hpp from idl
|
|
IF(BUILD_RTI)
|
|
RTIDDSGEN(SRCS_common som_enums.idl)
|
|
RTIDDSGEN(SRCS_common som.idl)
|
|
ENDIF()
|
|
|
|
# Generate som_dt[s,c]_types.h, som_ft[s,c]_types.h
|
|
IF(BUILD_RTI)
|
|
CODEGEN_TOPIC_TYPEDEFS(SRCS_common ${xml_FILE})
|
|
ENDIF()
|
|
# Generate som_[d|f]tc.h
|
|
IF(BUILD_RTI)
|
|
CODEGEN_CLIENT_TOPICS_IFC(SRCS_common ${xml_FILE})
|
|
ENDIF()
|
|
|
|
NGL_ADD_LIBRARY(AAR SV WS svcSomCommon SHARED ${SRCS_common})
|
|
NGL_TARGET_INCLUDE_DIRECTORIES(svcSomCommon
|
|
PUBLIC
|
|
${CMAKE_CURRENT_SOURCE_DIR}/../
|
|
${CMAKE_CURRENT_BINARY_DIR}/../
|
|
)
|
|
NGL_TARGET_LINK_LIBRARIES(svcSomCommon
|
|
PRIVATE
|
|
RTI::nddscpp2
|
|
PUBLIC
|
|
Qt6::Core
|
|
$<IF:$<TARGET_EXISTS:ddscore>,ddscore,>
|
|
ngldb
|
|
NGLLogger
|
|
)
|
|
NGL_INSTALL_TARGET(svcSomCommon)
|
|
|
|
#
|
|
# --- Library svcSomClient --------------------------------------------------------------------------------
|
|
#
|
|
SET(SRCS_client
|
|
som_export.h
|
|
)
|
|
# generate som_[d|f]tc.h, som_[d|f]tc_impl.[cpp|h]
|
|
IF(BUILD_RTI)
|
|
CODEGEN_CLIENT_TOPICS_IMPL(SRCS_client ${xml_FILE})
|
|
ENDIF()
|
|
|
|
NGL_ADD_LIBRARY(AAR SV WS svcSomClient SHARED ${SRCS_client})
|
|
NGL_TARGET_INCLUDE_DIRECTORIES(svcSomClient
|
|
PUBLIC
|
|
${CMAKE_CURRENT_SOURCE_DIR}/../
|
|
${CMAKE_CURRENT_BINARY_DIR}/../
|
|
)
|
|
|
|
NGL_TARGET_LINK_LIBRARIES(svcSomClient
|
|
PRIVATE
|
|
RTI::nddscpp2
|
|
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
|
|
PUBLIC
|
|
svcSomCommon
|
|
ddsftc
|
|
)
|
|
NGL_INSTALL_TARGET(svcSomClient)
|
|
|
|
#
|
|
# --- Library svcSomServer --------------------------------------------------------------------------------
|
|
#
|
|
SET(SRCS_server
|
|
som_export.h
|
|
)
|
|
|
|
# generate som_[d|f]ts.h, som_[d|f]ts_impl.[cpp|h]
|
|
IF(BUILD_RTI)
|
|
CODEGEN_SERVER_TOPICS(SRCS_server ${xml_FILE})
|
|
ENDIF()
|
|
|
|
NGL_ADD_LIBRARY(AAR SV svcSomServer SHARED ${SRCS_server})
|
|
NGL_TARGET_INCLUDE_DIRECTORIES(svcSomServer
|
|
PUBLIC
|
|
${CMAKE_CURRENT_SOURCE_DIR}/../
|
|
${CMAKE_CURRENT_BINARY_DIR}/../
|
|
)
|
|
|
|
NGL_TARGET_LINK_LIBRARIES(svcSomServer
|
|
PRIVATE
|
|
RTI::nddscpp2
|
|
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
|
|
ddsfts
|
|
ngldb
|
|
PUBLIC
|
|
svcSomCommon
|
|
)
|
|
NGL_INSTALL_TARGET(svcSomServer)
|
|
|
|
#
|
|
# --- Topic Type Plugin --------------------------------------------------------------
|
|
#
|
|
IF(BUILD_RTI)
|
|
CREATE_TOPIC_TYPE_PLUGIN(${xml_FILE})
|
|
ENDIF()
|
|
|
|
#
|
|
# --- Executable svcSoundManagement (sSOM) -------------------------------------------------
|
|
#
|
|
SET(SRCS_exe
|
|
main.cpp
|
|
main_handler.cpp
|
|
main_handler.h
|
|
dds_handler.cpp
|
|
dds_handler.h
|
|
handler_sounds.cpp
|
|
handler_sounds.h
|
|
settings.cpp
|
|
settings.h
|
|
${xml_FILE}
|
|
)
|
|
|
|
# Generate som.sql, som.xml
|
|
IF(BUILD_RTI)
|
|
CODEGEN_SQL(SRCS_exe ${xml_FILE})
|
|
ENDIF()
|
|
|
|
NGL_ADD_EXECUTABLE(AAR SV svcSoundManagement ${SRCS_exe})
|
|
NGL_TARGET_LINK_LIBRARIES(svcSoundManagement
|
|
Qt6::Core
|
|
Qt6::Network
|
|
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
|
|
ddsQoS
|
|
svcSomCommon
|
|
svcSomServer
|
|
svcSomClient
|
|
$<IF:$<TARGET_EXISTS:svcIsmClient>,svcIsmClient,>
|
|
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
|
|
nglsettings
|
|
ProjectConfig
|
|
LtsCommandLineParser
|
|
LtsUtilsCore
|
|
LtsCoordTrans
|
|
NGLLogger
|
|
nglcoreapplication
|
|
svcCoreClient
|
|
ngltools
|
|
ngldb
|
|
)
|
|
NGL_INSTALL_TARGET(svcSoundManagement)
|
|
NGL_INSTALL(AAR SV FILES log4cxx_som.props DESTINATION bin)
|
|
NGL_ADD_TARGET_LINK(svcSoundManagement sSOM)
|
|
|
|
# Uncomment if necessary
|
|
#ADD_SUBDIRECTORY(UnitTests)
|
|
#ADD_SUBDIRECTORY(ModuleTests)
|
|
|