Configure the Release 2 scope in the merged CMakeLists tree

- Lts/CMakeLists.txt: restore the cleanup scope (Tools, DDS, Common,
  Services, Proxies, Plugins) - the validation version configured only
  Lts/Common and TrainingAreaBase, silently dropping the GROUP1 DDS
  targets, the GROUP5 tools and the service libraries.
- 11 further scope CMakeLists from cleanup: the validation versions had
  removed the per-module unit-test subdirectories (ctest baseline
  targets), LtsUtilsGui, and used a stale GeographicLib link style.
- PrtCnv: keep the validation CMAKE_CURRENT_BINARY_DIR include
  (generated prtcnvlib_export.h).
- sPDM executable: guard on Lts/Common/LtsWebSocket (pruned, link
  orphan) like the sTAB executable.
This commit is contained in:
berrux-dev committed 2026-11-16 19:36:39 +01:00
1 parent 262fd226f9
commit edd5e3ba81
13 files changed
+118 -27

No files matched your search

@@ -35,6 +35,8 @@ NGL_TARGET_LINK_LIBRARIES(LtsAppDescriptor
NGL_INSTALL_TARGET(LtsAppDescriptor)
# LtsAppDescriptorChecker
SET(LtsAppDescriptorChecker_SRCS
checker/main.cpp
@@ -49,6 +51,27 @@ NGL_TARGET_LINK_LIBRARIES(LtsAppDescriptorChecker
Qt6::Core
)
# LtsAppDescriptorEditor => Hat niemand benutzt, wird keiner benutzen, also wird der bis auf Weiteres auch nicht an die neue Syntax angepasst.
#SET(LtsAppDescriptorEditor_SRCS
# lts_app_descriptor_editor.cpp
# lts_app_descriptor_editor.h
#)
#NGL_WRAP_UI(LtsAppDescriptorEditor_SRCS
# lts_app_descriptor_editor.ui
#)
#NGL_ADD_LIBRARY2(WS NO_TRANSLATION LtsAppDescriptorEditor SHARED ${LtsAppDescriptorEditor_SRCS})
#NGL_TARGET_INCLUDE_DIRECTORIES(LtsAppDescriptorEditor
# PUBLIC
# ${CMAKE_CURRENT_SOURCE_DIR}/../
#)
if(QT6_GUI_AVAILABLE)
#NGL_TARGET_LINK_LIBRARIES(LtsAppDescriptorEditor
# PUBLIC
@@ -19,3 +19,5 @@ NGL_TARGET_LINK_LIBRARIES(LtsCommandLineParser
PUBLIC
Qt6::Core
)
ADD_SUBDIRECTORY(unit-test)
@@ -13,8 +13,6 @@ else()
endif()
# Add system GeographicLib Find module path
list(APPEND CMAKE_MODULE_PATH /usr/share/cmake/geographiclib)
FIND_PACKAGE(GeographicLib)
NGL_ADD_LIBRARY2(LtsCoordTrans WS AAR SV HLA SHARED
lts_coord_trans.h
@@ -25,11 +23,9 @@ NGL_TARGET_LINK_LIBRARIES(LtsCoordTrans
Qt6::Core
)
if (GeographicLib_FOUND)
TARGET_LINK_LIBRARIES(LtsCoordTrans
PRIVATE ${GeographicLib_LIBRARIES}
NGL_TARGET_LINK_LIBRARIES(LtsCoordTrans
PRIVATE GeographicLib::GeographicLib_SHARED
)
TARGET_INCLUDE_DIRECTORIES(LtsCoordTrans PRIVATE ${GeographicLib_INCLUDE_DIRS})
LINK_DIRECTORIES(${GeographicLib_LIBRARY_DIRS})
else()
message(STATUS "GeographicLib not found; building LtsCoordTrans without it")
endif()
@@ -70,12 +66,10 @@ IF(TARGET LtsCoordTrans)
SET(_tools lonlat2mgrs mgrs2lonlat)
FOREACH(_tool ${_tools})
NGL_ADD_EXECUTABLE(ALL ${_tool} ${_tool}.cpp)
TARGET_LINK_LIBRARIES(${_tool}
NGL_TARGET_LINK_LIBRARIES(${_tool}
Qt6::Core
${GeographicLib_LIBRARIES}
GeographicLib::GeographicLib_SHARED
)
TARGET_INCLUDE_DIRECTORIES(${_tool} PRIVATE ${GeographicLib_INCLUDE_DIRS})
LINK_DIRECTORIES(${GeographicLib_LIBRARY_DIRS})
NGL_INSTALL_TARGET(${_tool})
ENDFOREACH()
ENDIF()
@@ -96,9 +90,7 @@ IF(BUILD_TESTING AND TARGET LtsCoordTrans)
TARGET_LINK_LIBRARIES(lts_coord_trans_unit_test
LtsCoordTrans
Qt6::Test
${GeographicLib_LIBRARIES}
GeographicLib::GeographicLib_SHARED
)
TARGET_INCLUDE_DIRECTORIES(lts_coord_trans_unit_test PRIVATE ${GeographicLib_INCLUDE_DIRS})
LINK_DIRECTORIES(${GeographicLib_LIBRARY_DIRS})
ADD_TEST(NAME lts_coord_trans_unit_test COMMAND $<TARGET_FILE:lts_coord_trans_unit_test>)
ENDIF()
@@ -8,4 +8,5 @@
ADD_SUBDIRECTORY(LtsUtilsCore)
ADD_SUBDIRECTORY(LtsUtilsGui)
ADD_SUBDIRECTORY(LtsUtilsSettings)
@@ -48,3 +48,22 @@ NGL_TARGET_LINK_LIBRARIES(LtsUtilsCore
Qt6::Core
LtsUtilsCoreHeaderOnly
)
#
# --- Tests --------------------------------------------------------------
#
IF(BUILD_RTI AND (BUILD_WS OR BUILD_SV) AND BUILD_TESTING)
ADD_EXECUTABLE(utils_test
UnitTests/utils_test.cpp
UnitTests/utils_test.h
promise_examples.h
promise_examples.cpp
)
TARGET_LINK_LIBRARIES(utils_test
LtsUtilsCore
Qt6::Core
Qt6::Test
ddscore
)
ADD_TEST(NAME utils_test COMMAND $<TARGET_FILE:utils_test>)
ENDIF()