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).
56 lines
1.1 KiB
CMake
Executable File
56 lines
1.1 KiB
CMake
Executable File
#
|
|
# $Id$
|
|
# $HeadURL$
|
|
# $Author$
|
|
#
|
|
|
|
INCLUDE(MacroRTIDDSGen)
|
|
INCLUDE(MacroCodeGenIdl)
|
|
|
|
SET(xml_FILE srm_service.xml)
|
|
|
|
#
|
|
# --- Library svcSrmCommon --------------------------------------------------------------------------------
|
|
#
|
|
SET(SRCS_common
|
|
srm_export.h
|
|
logger.cpp
|
|
logger.h
|
|
)
|
|
|
|
# Generate srm_enums.idl / srm.idl
|
|
IF(BUILD_RTI)
|
|
CODEGEN_IDL_SVC(SRCS_common ${xml_FILE})
|
|
ENDIF()
|
|
|
|
# Generate *.cpp/*.hpp from idl
|
|
IF(BUILD_RTI)
|
|
RTIDDSGEN(SRCS_common srm_enums.idl)
|
|
RTIDDSGEN(SRCS_common srm.idl)
|
|
ENDIF()
|
|
|
|
# Generate srm_dt[s,c]_types.h, srm_ft[s,c]_types.h
|
|
IF(BUILD_RTI)
|
|
CODEGEN_TOPIC_TYPEDEFS(SRCS_common ${xml_FILE})
|
|
ENDIF()
|
|
# generate srm_[d|f]tc.h
|
|
IF(BUILD_RTI)
|
|
CODEGEN_CLIENT_TOPICS_IFC(SRCS_common ${xml_FILE})
|
|
ENDIF()
|
|
|
|
NGL_ADD_LIBRARY(AAR SV WS svcSrmCommon SHARED ${SRCS_common})
|
|
NGL_TARGET_INCLUDE_DIRECTORIES(svcSrmCommon
|
|
PUBLIC
|
|
${CMAKE_CURRENT_SOURCE_DIR}/../
|
|
${CMAKE_CURRENT_BINARY_DIR}/../
|
|
)
|
|
NGL_TARGET_LINK_LIBRARIES(svcSrmCommon
|
|
PRIVATE
|
|
RTI::nddscpp2
|
|
PUBLIC
|
|
Qt6::Core
|
|
$<IF:$<TARGET_EXISTS:ddscore>,ddscore,>
|
|
NGLLogger
|
|
)
|
|
NGL_INSTALL_TARGET(svcSrmCommon)
|