torstenandCopilot
7173785915
Major Changes:
- Merged latest Qt5 devel content from dlbo (292 files changed, 7 new dirs)
- Consolidated forward-declarations and include folders
- Removed unneeded modules per Niklas' repo check list
Build System Fixes:
- Fixed CMake VERSION_GREATER syntax in ParticipantManagement/CMakeLists.txt
- Added VLC packages (libvlc-dev, vlc-plugin-base) to docker_build.sh
- Added PostgreSQL dev packages (libpq-dev, postgresql-server-dev-all) to Dockerfile
- Fixed locale warnings (ANSI_X3.4-1968 → C.UTF-8)
- Fixed ArcGIS SDK path warnings when BUILD_ARCGIS=OFF
Code Generation Fixes:
- Fixed IDL enum collisions (PortType→CorePortType/DdsutPortType, PdmEventType)
- Fixed Grantlee template svc_translation.cpp.grantlee:
- Changed {{ idl_enum.name }}_def:: to {{ idl_enum.name }}::
- Fixed .underlying() calls for C++11 scoped enums (enum class)
- Removed generated files from repo (moc_*, *_dtc.h, *_ftc.h)
Validation:
- BUILD_RTI=ON: SUCCESS
- BUILD_RTI=OFF: SUCCESS
- C++17 standard maintained for RTI 7.7 compatibility
- Ubuntu 26.04 Docker environment verified
Remaining Warnings (expected):
- BgViewer, KDChart, KDReports, Poppler-Qt6 not found (optional features)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
160 lines
3.3 KiB
CMake
160 lines
3.3 KiB
CMake
#
|
|
# $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
|
|
CODEGEN_IDL_SVC(SRCS_common ${xml_FILE})
|
|
# Generate som_db_impl.cpp/.h, som_db.h
|
|
CODEGEN_DATABASE(SRCS_common ${xml_FILE})
|
|
|
|
# Generate *.cpp/*.hpp from idl
|
|
RTIDDSGEN(SRCS_common som_enums.idl)
|
|
RTIDDSGEN(SRCS_common som.idl)
|
|
|
|
# Generate som_dt[s,c]_types.h, som_ft[s,c]_types.h
|
|
CODEGEN_TOPIC_TYPEDEFS(SRCS_common ${xml_FILE})
|
|
# Generate som_[d|f]tc.h
|
|
CODEGEN_CLIENT_TOPICS_IFC(SRCS_common ${xml_FILE})
|
|
|
|
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
|
|
Qt5::Core
|
|
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]
|
|
CODEGEN_CLIENT_TOPICS_IMPL(SRCS_client ${xml_FILE})
|
|
|
|
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
|
|
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]
|
|
CODEGEN_SERVER_TOPICS(SRCS_server ${xml_FILE})
|
|
|
|
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
|
|
ddsconnector
|
|
ddsfts
|
|
ngldb
|
|
PUBLIC
|
|
svcSomCommon
|
|
)
|
|
NGL_INSTALL_TARGET(svcSomServer)
|
|
|
|
#
|
|
# --- Topic Type Plugin --------------------------------------------------------------
|
|
#
|
|
CREATE_TOPIC_TYPE_PLUGIN(${xml_FILE})
|
|
|
|
#
|
|
# --- 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
|
|
CODEGEN_SQL(SRCS_exe ${xml_FILE})
|
|
|
|
NGL_ADD_EXECUTABLE(AAR SV svcSoundManagement ${SRCS_exe})
|
|
NGL_TARGET_LINK_LIBRARIES(svcSoundManagement
|
|
Qt5::Core
|
|
Qt5::Network
|
|
ddsconnector
|
|
ddsQoS
|
|
svcSomCommon
|
|
svcSomServer
|
|
svcSomClient
|
|
svcIsmClient
|
|
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)
|
|
|