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).
207 lines
4.5 KiB
CMake
Executable File
207 lines
4.5 KiB
CMake
Executable File
#
|
|
# $Id$
|
|
# $HeadURL$
|
|
# $Author$
|
|
#
|
|
|
|
INCLUDE(MacroRTIDDSGen)
|
|
INCLUDE(MacroCodeGenIdl)
|
|
|
|
SET(xml_FILE scm_service.xml)
|
|
|
|
#
|
|
# --- Library svcScmCommon --------------------------------------------------------------------------------
|
|
#
|
|
SET(SRCS_common
|
|
scm_export.h
|
|
logger.cpp
|
|
logger.h
|
|
)
|
|
|
|
# Generate scm_enums.idl / scm.idl
|
|
IF(BUILD_RTI)
|
|
CODEGEN_IDL_SVC(SRCS_common ${xml_FILE})
|
|
ENDIF()
|
|
# Generate scm_db_impl.cpp/.h, scm_db.h
|
|
IF(BUILD_RTI)
|
|
CODEGEN_DATABASE(SRCS_common ${xml_FILE})
|
|
ENDIF()
|
|
|
|
# Generate *.cpp/*.hpp from idl
|
|
IF(BUILD_RTI)
|
|
RTIDDSGEN(SRCS_common scm_enums.idl)
|
|
RTIDDSGEN(SRCS_common scm.idl)
|
|
ENDIF()
|
|
|
|
# Generate scm_dt[s,c]_types.h, scm_ft[s,c]_types.h
|
|
IF(BUILD_RTI)
|
|
CODEGEN_TOPIC_TYPEDEFS(SRCS_common ${xml_FILE})
|
|
ENDIF()
|
|
# generate scm_[d|f]tc.h
|
|
IF(BUILD_RTI)
|
|
CODEGEN_CLIENT_TOPICS_IFC(SRCS_common ${xml_FILE})
|
|
ENDIF()
|
|
|
|
NGL_ADD_LIBRARY(SV AAR WS svcScmCommon SHARED ${SRCS_common})
|
|
NGL_TARGET_INCLUDE_DIRECTORIES(svcScmCommon
|
|
PUBLIC
|
|
${CMAKE_CURRENT_SOURCE_DIR}/../
|
|
${CMAKE_CURRENT_BINARY_DIR}/../
|
|
)
|
|
NGL_TARGET_LINK_LIBRARIES(svcScmCommon
|
|
PRIVATE
|
|
RTI::nddscpp2
|
|
PUBLIC
|
|
Qt6::Core
|
|
$<IF:$<TARGET_EXISTS:ddscore>,ddscore,>
|
|
NGLLogger
|
|
ngldb
|
|
)
|
|
NGL_INSTALL_TARGET(svcScmCommon)
|
|
|
|
#
|
|
# --- Library svcScmClient --------------------------------------------------------------------------------
|
|
#
|
|
SET(SRCS_client
|
|
scm_export.h
|
|
)
|
|
# generate scm_ftc_impl.[cpp|h]
|
|
IF(BUILD_RTI)
|
|
CODEGEN_CLIENT_TOPICS_IMPL(SRCS_client ${xml_FILE})
|
|
ENDIF()
|
|
|
|
NGL_ADD_LIBRARY(WS AAR SV svcScmClient SHARED ${SRCS_client})
|
|
NGL_TARGET_INCLUDE_DIRECTORIES(svcScmClient
|
|
PUBLIC
|
|
${CMAKE_CURRENT_SOURCE_DIR}/../
|
|
${CMAKE_CURRENT_BINARY_DIR}/../
|
|
)
|
|
|
|
NGL_TARGET_LINK_LIBRARIES(svcScmClient
|
|
PRIVATE
|
|
RTI::nddscpp2
|
|
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
|
|
PUBLIC
|
|
svcScmCommon
|
|
ddsftc
|
|
)
|
|
NGL_INSTALL_TARGET(svcScmClient)
|
|
|
|
#
|
|
# --- Library svcScmServer --------------------------------------------------------------------------------
|
|
#
|
|
SET(SRCS_server
|
|
scm_export.h
|
|
)
|
|
# generate scm_[d|f]ts.h, scm_[d|f]ts_impl.[cpp|h]
|
|
IF(BUILD_RTI)
|
|
CODEGEN_SERVER_TOPICS(SRCS_server ${xml_FILE})
|
|
ENDIF()
|
|
|
|
NGL_ADD_LIBRARY(SV AAR svcScmServer SHARED ${SRCS_server})
|
|
NGL_TARGET_INCLUDE_DIRECTORIES(svcScmServer
|
|
PUBLIC
|
|
${CMAKE_CURRENT_SOURCE_DIR}/../
|
|
${CMAKE_CURRENT_BINARY_DIR}/../
|
|
)
|
|
|
|
NGL_TARGET_LINK_LIBRARIES(svcScmServer
|
|
PRIVATE
|
|
RTI::nddscpp2
|
|
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
|
|
ddsfts
|
|
PUBLIC
|
|
svcScmCommon
|
|
ngldb
|
|
)
|
|
NGL_INSTALL_TARGET(svcScmServer)
|
|
|
|
#
|
|
# --- Topic Type Plugin --------------------------------------------------------------
|
|
#
|
|
IF(BUILD_RTI)
|
|
CREATE_TOPIC_TYPE_PLUGIN(${xml_FILE})
|
|
ENDIF()
|
|
|
|
#
|
|
# --- Executable ServiceManagement(svcServiceManagement) -------------------------------------------------
|
|
#
|
|
SET(SRCS_exe
|
|
dds_handler.cpp
|
|
dds_handler.h
|
|
group.cpp
|
|
group.h
|
|
group_handler.cpp
|
|
group_handler.h
|
|
heartbeat_listener.cpp
|
|
heartbeat_listener.h
|
|
licence_donator.h
|
|
licence_handler.cpp
|
|
licence_handler.h
|
|
main.cpp
|
|
service.cpp
|
|
service.h
|
|
service_donator.h
|
|
service_handler.cpp
|
|
service_handler.h
|
|
service_process.cpp
|
|
service_process.h
|
|
main_handler.cpp
|
|
main_handler.h
|
|
settings.cpp
|
|
settings.h
|
|
|
|
WebSocketInterface/data_manager.cpp
|
|
WebSocketInterface/data_manager.h
|
|
WebSocketInterface/json_keys.h
|
|
WebSocketInterface/websocket_interface_handler.cpp
|
|
WebSocketInterface/websocket_interface_handler.h
|
|
WebSocketInterface/Messages/client_message.cpp
|
|
WebSocketInterface/Messages/client_message.h
|
|
WebSocketInterface/Messages/reply_message.cpp
|
|
WebSocketInterface/Messages/reply_message.h
|
|
|
|
${xml_FILE}
|
|
log4cxx_scm.props
|
|
)
|
|
|
|
# Generate scm.sql, scm.xml
|
|
IF(BUILD_RTI)
|
|
CODEGEN_SQL(SRCS_exe ${xml_FILE})
|
|
ENDIF()
|
|
# install dummy licence file for developers
|
|
IF(NOT BUILD_RPM)
|
|
INSTALL_SHARED_FILES(SRCS_exe
|
|
FILES "licence_file.crl" "oc_licence_file.crl"
|
|
DESTINATION "Licence"
|
|
SV
|
|
AAR
|
|
)
|
|
ENDIF()
|
|
|
|
NGL_ADD_SVC_ICON(SRCS_exe)
|
|
NGL_ADD_EXECUTABLE(SV AAR svcServiceManagement ${SRCS_exe})
|
|
NGL_TARGET_LINK_LIBRARIES(svcServiceManagement
|
|
Qt6::Core
|
|
svcCoreClient
|
|
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
|
|
codegen_base
|
|
LtsCommandLineParser
|
|
nglsinglecoreapplication
|
|
NGLLogger
|
|
nglsettings
|
|
ngltools
|
|
ProjectConfig
|
|
svcScmCommon
|
|
svcScmServer
|
|
LtsLicence
|
|
LtsWebSocketServer
|
|
)
|
|
NGL_INSTALL_TARGET(svcServiceManagement)
|
|
NGL_INSTALL(SV AAR FILES log4cxx_scm.props DESTINATION bin)
|
|
NGL_INSTALL(SV AAR PROGRAMS check_start DESTINATION bin)
|
|
|
|
# Uncomment if necessary
|
|
ADD_SUBDIRECTORY(UnitTests)
|
|
#ADD_SUBDIRECTORY(ModuleTests)
|