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>
135 lines
4.4 KiB
CMake
135 lines
4.4 KiB
CMake
# $Revision$
|
|
# $Date$
|
|
# $Id$
|
|
|
|
IF(NGS_INCLUDE_DIRS AND NGS_LIBRARIES)
|
|
SET(NGS_FOUND TRUE)
|
|
ELSE()
|
|
|
|
SET(FOM_NAME "RPRFOM20d17E")
|
|
IF("$ENV{NGS_ROOT}" STREQUAL "")
|
|
SET(NGS_ROOT "/opt/NGS/NGSPublic")
|
|
MESSAGE(STATUS "NGS_ROOT env var not set - using ${NGS_ROOT}")
|
|
ELSE()
|
|
SET(NGS_ROOT "$ENV{NGS_ROOT}")
|
|
ENDIF()
|
|
|
|
FIND_PROGRAM(NGS_FOMBUILD fombuild
|
|
PATHS ${NGS_ROOT}/exe
|
|
)
|
|
FIND_PATH(NGS_INCLUDE_DIR NGSUtils/SimTime.h
|
|
PATHS ${NGS_ROOT}/include
|
|
)
|
|
FIND_PATH(NGS_SM_INCLUDE_DIR ISystem.h
|
|
PATHS ${NGS_INCLUDE_DIR}
|
|
PATH_SUFFIXES SimulationManager
|
|
)
|
|
FIND_PATH(NGS_FC_INCLUDE_DIR IRTIAmbassador.h
|
|
PATHS ${NGS_INCLUDE_DIR}
|
|
PATH_SUFFIXES RTIFacadeAPI
|
|
)
|
|
FIND_PATH(NGS_GE_INCLUDE_DIR SimulatedWorldAPI.h
|
|
PATHS ${NGS_INCLUDE_DIR}
|
|
PATH_SUFFIXES SWGeneral
|
|
)
|
|
FIND_PATH(NGS_UT_INCLUDE_DIR NGSConfig.h
|
|
PATHS ${NGS_INCLUDE_DIR}
|
|
PATH_SUFFIXES NGSUtils
|
|
)
|
|
FIND_PATH(NGS_PF_INCLUDE_DIR configureBool.h
|
|
PATHS ${NGS_INCLUDE_DIR}
|
|
PATH_SUFFIXES NGSPlatformConfigure
|
|
)
|
|
# we're using RPR2 FOM
|
|
FIND_PATH(NGS_FOM_INCLUDE_DIR WorldLocationStruct.h
|
|
PATHS ${NGS_INCLUDE_DIR}
|
|
PATH_SUFFIXES sw${FOM_NAME}/rpr
|
|
PATH_SUFFIXES sw${FOM_NAME}/rpr2
|
|
)
|
|
|
|
FIND_LIBRARY(NGS_LIBRARY NGS
|
|
PATHS ${NGS_ROOT}/lib
|
|
PATHS ${NGS_ROOT}/lib64
|
|
)
|
|
FIND_LIBRARY(NGS_LIBRARY_SWGENERAL SWGENERAL
|
|
PATHS ${NGS_ROOT}/lib
|
|
PATHS ${NGS_ROOT}/lib64
|
|
)
|
|
FIND_LIBRARY(NGS_LIBRARY_UTILS NGSUtils
|
|
PATHS ${NGS_ROOT}/lib
|
|
PATHS ${NGS_ROOT}/lib64
|
|
)
|
|
FIND_LIBRARY(FOM_LIBRARY SW${FOM_NAME}
|
|
PATHS ${NGS_ROOT}/lib
|
|
PATHS ${NGS_ROOT}/lib64
|
|
)
|
|
FIND_LIBRARY(NGS_LIBRARY_CORBA CorbaNotify
|
|
PATHS ${NGS_ROOT}/lib/CorbaNotifyCdr
|
|
)
|
|
INCLUDE(FindPackageHandleStandardArgs)
|
|
FIND_PACKAGE_HANDLE_STANDARD_ARGS(NGS DEFAULT_MSG NGS_LIBRARY
|
|
NGS_LIBRARY_SWGENERAL
|
|
NGS_LIBRARY_UTILS
|
|
NGS_LIBRARY_CORBA
|
|
FOM_LIBRARY
|
|
NGS_SM_INCLUDE_DIR
|
|
NGS_FC_INCLUDE_DIR
|
|
NGS_GE_INCLUDE_DIR
|
|
NGS_UT_INCLUDE_DIR
|
|
)
|
|
SET(NGS_INCLUDE_DIRS
|
|
${NGS_INCLUDE_DIR}
|
|
${NGS_SM_INCLUDE_DIR}
|
|
${NGS_FC_INCLUDE_DIR}
|
|
${NGS_GE_INCLUDE_DIR}
|
|
${NGS_UT_INCLUDE_DIR}
|
|
${NGS_PF_INCLUDE_DIR}
|
|
${NGS_FOM_INCLUDE_DIR}
|
|
CACHE STRING "All ngs include dirs" FORCE
|
|
)
|
|
SET(NGS_LIBRARIES
|
|
${NGS_LIBRARY}
|
|
${NGS_LIBRARY_SWGENERAL}
|
|
${NGS_LIBRARY_UTILS}
|
|
${NGS_LIBRARY_CORBA}
|
|
${FOM_LIBRARY}
|
|
CACHE STRING "All ngs libraries" FORCE
|
|
)
|
|
MARK_AS_ADVANCED(NGS_INCLUDE_DIR NGS_LIBRARY FOM_LIBRARY)
|
|
ENDIF()
|
|
|
|
SET(NGS_IS_GUEZ OFF)
|
|
SET(NGS_IS_AHTC OFF)
|
|
IF (NGS_FOUND)
|
|
FIND_PATH(NGS_GUEZ_INCLUDE_DIR TacticalStatusStruct.h
|
|
PATHS ${NGS_FOM_INCLUDE_DIR})
|
|
FIND_PATH(NGS_AHTC_INCLUDE_DIR LongBowApacheObjClass.h
|
|
PATHS ${NGS_FOM_INCLUDE_DIR})
|
|
IF (NGS_GUEZ_INCLUDE_DIR AND EXISTS "${NGS_GUEZ_INCLUDE_DIR}/TacticalStatusStruct.h")
|
|
SET(NGS_IS_GUEZ ON)
|
|
MESSAGE(STATUS "NGS - GUEZ version (${NGS_GUEZ_INCLUDE_DIR})")
|
|
ELSE()
|
|
SET(NGS_IS_GUEZ OFF)
|
|
ENDIF()
|
|
IF (NGS_AHTC_INCLUDE_DIR AND EXISTS "${NGS_AHTC_INCLUDE_DIR}/LongBowApacheObjClass.h")
|
|
SET(NGS_IS_AHTC ON)
|
|
MESSAGE(STATUS "NGS - AHTC version (${NGS_AHTC_INCLUDE_DIR})")
|
|
ELSE()
|
|
SET(NGS_IS_AHTC OFF)
|
|
ENDIF()
|
|
ENDIF()
|
|
|
|
IF(NOT TARGET NGS::NGS)
|
|
ADD_LIBRARY(NGS::NGS UNKNOWN IMPORTED)
|
|
SET_PROPERTY(TARGET NGS::NGS PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${NGS_INCLUDE_DIRS})
|
|
SET_PROPERTY(TARGET NGS::NGS PROPERTY INTERFACE_SYSTEM_INCLUDE_DIRECTORIES ${NGS_INCLUDE_DIRS}) # -isystem
|
|
SET_PROPERTY(TARGET NGS::NGS PROPERTY IMPORTED_LOCATION "${NGS_LIBRARY}")
|
|
|
|
SET_PROPERTY(TARGET NGS::NGS APPEND PROPERTY INTERFACE_LINK_LIBRARIES
|
|
"${NGS_LIBRARY_SWGENERAL}"
|
|
"${NGS_LIBRARY_UTILS}"
|
|
"${NGS_LIBRARY_CORBA}"
|
|
"${FOM_LIBRARY}"
|
|
)
|
|
ENDIF()
|