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:
1 parent
262fd226f9
commit
edd5e3ba81
13 files changed
+118
-27
No files matched your search
@@ -15,21 +15,44 @@ else()
|
|||||||
message(WARNING "Doxygen config ${CMAKE_SOURCE_DIR}/doxygen/DoxyfileLts.in not found; skipping ADD_DOXYGEN_TARGET(Lts)")
|
message(WARNING "Doxygen config ${CMAKE_SOURCE_DIR}/doxygen/DoxyfileLts.in not found; skipping ADD_DOXYGEN_TARGET(Lts)")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# Release scope: only build Lts/Common and Lts/Proxies/TrainingAreaBase (tabTelegrams library)
|
# Add only existing subdirectories to allow partial checkouts / incremental migration
|
||||||
# Excludes: Tools, Application, DDS, Services, most of Proxies, Plugins, Viewer, Projects
|
# Release 2 scope: Tools, DDS, Common, Services (minimal), Proxies (TrainingAreaBase only), Plugins (Styles only for LtsWidgets dependency)
|
||||||
message(STATUS "Building Lts/Common and Lts/Proxies/TrainingAreaBase")
|
# Excluded: Application, Viewer, Projects, most Plugins (not in Release 2)
|
||||||
if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/Common")
|
set(LTS_SUBDIRS Tools DDS Common Services Proxies Plugins)
|
||||||
NGL_ADD_SUBDIR_GUARDED(Common)
|
foreach(dir IN LISTS LTS_SUBDIRS)
|
||||||
|
if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${dir}")
|
||||||
|
# Use guarded add so top-level MIGRATE_MODULE can restrict which Lts subdirs are included
|
||||||
|
NGL_ADD_SUBDIR_GUARDED(${dir})
|
||||||
else()
|
else()
|
||||||
message(STATUS "Skipping missing Lts subdirectory: Common")
|
message(STATUS "Skipping missing Lts subdirectory: ${dir}")
|
||||||
endif()
|
|
||||||
# TrainingAreaBase provides tabTelegrams library needed by TetraIF/CoPrtCnv
|
|
||||||
if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/Proxies/TrainingAreaBase")
|
|
||||||
NGL_ADD_SUBDIR_GUARDED(Proxies/TrainingAreaBase)
|
|
||||||
else()
|
|
||||||
message(STATUS "Skipping missing Lts subdirectory: Proxies/TrainingAreaBase")
|
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# Export headers included by bare name from module sources (release scope)
|
endforeach()
|
||||||
|
|
||||||
|
IF (BUILD_TESTING)
|
||||||
|
if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/Tests")
|
||||||
|
ADD_SUBDIRECTORY(Tests)
|
||||||
|
else()
|
||||||
|
message(STATUS "Skipping missing Tests directory under Lts (BUILD_TESTING is ON)")
|
||||||
|
endif()
|
||||||
|
ENDIF()
|
||||||
|
|
||||||
|
OPTION(BUILD_DOCS "Build documentation as html files from Lts/Documentation" OFF)
|
||||||
|
IF (BUILD_DOCS)
|
||||||
|
ADD_SUBDIRECTORY(Documentation)
|
||||||
|
ENDIF()
|
||||||
|
|
||||||
|
# Ensure codegen macros are available before calling CODEGEN_* helpers
|
||||||
|
INCLUDE(MacroCodeGenIdl)
|
||||||
|
|
||||||
|
# Add stub headers for non-RTI/non-FilterManagement builds
|
||||||
|
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../include/AudioVideoManagement/)
|
||||||
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../include/NGLLogger/)
|
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../include/NGLLogger/)
|
||||||
|
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../include/LtsSession/)
|
||||||
|
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../include/TopicEditorBase/)
|
||||||
|
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../include/OperatorManagement/)
|
||||||
|
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../include/LtsScriptTimeline/)
|
||||||
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../include/LtsUtilsGuiDds/)
|
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../include/LtsUtilsGuiDds/)
|
||||||
|
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../include/Services/PresentationManagement/)
|
||||||
|
|
||||||
|
CODEGEN_WRITE_SERVICEFILE_INFO()
|
||||||
@@ -35,6 +35,8 @@ NGL_TARGET_LINK_LIBRARIES(LtsAppDescriptor
|
|||||||
|
|
||||||
NGL_INSTALL_TARGET(LtsAppDescriptor)
|
NGL_INSTALL_TARGET(LtsAppDescriptor)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# LtsAppDescriptorChecker
|
# LtsAppDescriptorChecker
|
||||||
SET(LtsAppDescriptorChecker_SRCS
|
SET(LtsAppDescriptorChecker_SRCS
|
||||||
checker/main.cpp
|
checker/main.cpp
|
||||||
@@ -49,6 +51,27 @@ NGL_TARGET_LINK_LIBRARIES(LtsAppDescriptorChecker
|
|||||||
Qt6::Core
|
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)
|
if(QT6_GUI_AVAILABLE)
|
||||||
#NGL_TARGET_LINK_LIBRARIES(LtsAppDescriptorEditor
|
#NGL_TARGET_LINK_LIBRARIES(LtsAppDescriptorEditor
|
||||||
# PUBLIC
|
# PUBLIC
|
||||||
|
|||||||
@@ -19,3 +19,5 @@ NGL_TARGET_LINK_LIBRARIES(LtsCommandLineParser
|
|||||||
PUBLIC
|
PUBLIC
|
||||||
Qt6::Core
|
Qt6::Core
|
||||||
)
|
)
|
||||||
|
|
||||||
|
ADD_SUBDIRECTORY(unit-test)
|
||||||
@@ -13,8 +13,6 @@ else()
|
|||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
||||||
# Add system GeographicLib Find module path
|
|
||||||
list(APPEND CMAKE_MODULE_PATH /usr/share/cmake/geographiclib)
|
|
||||||
FIND_PACKAGE(GeographicLib)
|
FIND_PACKAGE(GeographicLib)
|
||||||
NGL_ADD_LIBRARY2(LtsCoordTrans WS AAR SV HLA SHARED
|
NGL_ADD_LIBRARY2(LtsCoordTrans WS AAR SV HLA SHARED
|
||||||
lts_coord_trans.h
|
lts_coord_trans.h
|
||||||
@@ -25,11 +23,9 @@ NGL_TARGET_LINK_LIBRARIES(LtsCoordTrans
|
|||||||
Qt6::Core
|
Qt6::Core
|
||||||
)
|
)
|
||||||
if (GeographicLib_FOUND)
|
if (GeographicLib_FOUND)
|
||||||
TARGET_LINK_LIBRARIES(LtsCoordTrans
|
NGL_TARGET_LINK_LIBRARIES(LtsCoordTrans
|
||||||
PRIVATE ${GeographicLib_LIBRARIES}
|
PRIVATE GeographicLib::GeographicLib_SHARED
|
||||||
)
|
)
|
||||||
TARGET_INCLUDE_DIRECTORIES(LtsCoordTrans PRIVATE ${GeographicLib_INCLUDE_DIRS})
|
|
||||||
LINK_DIRECTORIES(${GeographicLib_LIBRARY_DIRS})
|
|
||||||
else()
|
else()
|
||||||
message(STATUS "GeographicLib not found; building LtsCoordTrans without it")
|
message(STATUS "GeographicLib not found; building LtsCoordTrans without it")
|
||||||
endif()
|
endif()
|
||||||
@@ -70,12 +66,10 @@ IF(TARGET LtsCoordTrans)
|
|||||||
SET(_tools lonlat2mgrs mgrs2lonlat)
|
SET(_tools lonlat2mgrs mgrs2lonlat)
|
||||||
FOREACH(_tool ${_tools})
|
FOREACH(_tool ${_tools})
|
||||||
NGL_ADD_EXECUTABLE(ALL ${_tool} ${_tool}.cpp)
|
NGL_ADD_EXECUTABLE(ALL ${_tool} ${_tool}.cpp)
|
||||||
TARGET_LINK_LIBRARIES(${_tool}
|
NGL_TARGET_LINK_LIBRARIES(${_tool}
|
||||||
Qt6::Core
|
Qt6::Core
|
||||||
${GeographicLib_LIBRARIES}
|
GeographicLib::GeographicLib_SHARED
|
||||||
)
|
)
|
||||||
TARGET_INCLUDE_DIRECTORIES(${_tool} PRIVATE ${GeographicLib_INCLUDE_DIRS})
|
|
||||||
LINK_DIRECTORIES(${GeographicLib_LIBRARY_DIRS})
|
|
||||||
NGL_INSTALL_TARGET(${_tool})
|
NGL_INSTALL_TARGET(${_tool})
|
||||||
ENDFOREACH()
|
ENDFOREACH()
|
||||||
ENDIF()
|
ENDIF()
|
||||||
@@ -96,9 +90,7 @@ IF(BUILD_TESTING AND TARGET LtsCoordTrans)
|
|||||||
TARGET_LINK_LIBRARIES(lts_coord_trans_unit_test
|
TARGET_LINK_LIBRARIES(lts_coord_trans_unit_test
|
||||||
LtsCoordTrans
|
LtsCoordTrans
|
||||||
Qt6::Test
|
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>)
|
ADD_TEST(NAME lts_coord_trans_unit_test COMMAND $<TARGET_FILE:lts_coord_trans_unit_test>)
|
||||||
ENDIF()
|
ENDIF()
|
||||||
@@ -8,4 +8,5 @@
|
|||||||
|
|
||||||
|
|
||||||
ADD_SUBDIRECTORY(LtsUtilsCore)
|
ADD_SUBDIRECTORY(LtsUtilsCore)
|
||||||
|
ADD_SUBDIRECTORY(LtsUtilsGui)
|
||||||
ADD_SUBDIRECTORY(LtsUtilsSettings)
|
ADD_SUBDIRECTORY(LtsUtilsSettings)
|
||||||
@@ -48,3 +48,22 @@ NGL_TARGET_LINK_LIBRARIES(LtsUtilsCore
|
|||||||
Qt6::Core
|
Qt6::Core
|
||||||
LtsUtilsCoreHeaderOnly
|
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()
|
||||||
@@ -193,6 +193,10 @@ ENDIF()
|
|||||||
#
|
#
|
||||||
# --- Executable svcProjectDataManagement (sPDM) -------------------------------------------------
|
# --- Executable svcProjectDataManagement (sPDM) -------------------------------------------------
|
||||||
#
|
#
|
||||||
|
# The executable links LtsWebSocketServer, which was pruned from the
|
||||||
|
# tree (prune commit 7fc6f6664), so the target is only created when the
|
||||||
|
# module is present.
|
||||||
|
IF(EXISTS "${CMAKE_SOURCE_DIR}/Lts/Common/LtsWebSocket")
|
||||||
LIST(APPEND SRCS_exe
|
LIST(APPEND SRCS_exe
|
||||||
convert_db_to_dds.h
|
convert_db_to_dds.h
|
||||||
dds_handler.cpp
|
dds_handler.cpp
|
||||||
@@ -237,6 +241,7 @@ NGL_TARGET_LINK_LIBRARIES(svcProjectDataManagement
|
|||||||
NGL_INSTALL_TARGET(svcProjectDataManagement)
|
NGL_INSTALL_TARGET(svcProjectDataManagement)
|
||||||
NGL_INSTALL(AAR SV FILES log4cxx_pdm.props DESTINATION bin)
|
NGL_INSTALL(AAR SV FILES log4cxx_pdm.props DESTINATION bin)
|
||||||
NGL_ADD_TARGET_LINK(svcProjectDataManagement sPDM)
|
NGL_ADD_TARGET_LINK(svcProjectDataManagement sPDM)
|
||||||
|
ENDIF()
|
||||||
|
|
||||||
# Uncomment if necessary
|
# Uncomment if necessary
|
||||||
#ADD_SUBDIRECTORY(UnitTests)
|
#ADD_SUBDIRECTORY(UnitTests)
|
||||||
|
|||||||
@@ -5,6 +5,10 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
|
#ADD_SUBDIRECTORY(TetraTestServer)
|
||||||
|
ADD_SUBDIRECTORY(LastTest)
|
||||||
|
ADD_SUBDIRECTORY(LastTestAuswertung)
|
||||||
|
|
||||||
SET(PrtCnv_SRCS
|
SET(PrtCnv_SRCS
|
||||||
logger.h
|
logger.h
|
||||||
logger.cpp
|
logger.cpp
|
||||||
@@ -59,7 +63,7 @@ NGL_TARGET_LINK_LIBRARIES(PrtCnvLib
|
|||||||
)
|
)
|
||||||
NGL_TARGET_INCLUDE_DIRECTORIES(PrtCnvLib
|
NGL_TARGET_INCLUDE_DIRECTORIES(PrtCnvLib
|
||||||
PUBLIC
|
PUBLIC
|
||||||
${CMAKE_CURRENT_BINARY_DIR}
|
${CMAKE_CURRENT_BINARY_DIR} # prtcnvlib_export.h is generated here
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/../
|
${CMAKE_CURRENT_SOURCE_DIR}/../
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -57,5 +57,9 @@ ELSE()
|
|||||||
MESSAGE(STATUS "Log4Qt not found; skipping test_ngllogger")
|
MESSAGE(STATUS "Log4Qt not found; skipping test_ngllogger")
|
||||||
ENDIF()
|
ENDIF()
|
||||||
|
|
||||||
|
#
|
||||||
|
# Unit tests
|
||||||
|
#
|
||||||
|
ADD_SUBDIRECTORY(unit-test)
|
||||||
|
|
||||||
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/log4cxx.props ${CMAKE_BINARY_DIR}/log4cxx.props COPYONLY)
|
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/log4cxx.props ${CMAKE_BINARY_DIR}/log4cxx.props COPYONLY)
|
||||||
@@ -33,3 +33,8 @@ NGL_TARGET_LINK_LIBRARIES(wms_json_ds
|
|||||||
PUBLIC
|
PUBLIC
|
||||||
Qt6::Core
|
Qt6::Core
|
||||||
)
|
)
|
||||||
|
|
||||||
|
#
|
||||||
|
# Unit tests
|
||||||
|
#
|
||||||
|
ADD_SUBDIRECTORY(unit-test)
|
||||||
@@ -21,6 +21,7 @@ else()
|
|||||||
set(Qt6_Widgets "")
|
set(Qt6_Widgets "")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
||||||
SET(nglapplication_SRCS
|
SET(nglapplication_SRCS
|
||||||
nglapplication.cpp
|
nglapplication.cpp
|
||||||
nglapplication.h
|
nglapplication.h
|
||||||
@@ -101,6 +102,11 @@ NGL_TARGET_LINK_LIBRARIES(nglcoreapplication
|
|||||||
)
|
)
|
||||||
NGL_INSTALL_TARGET(nglcoreapplication)
|
NGL_INSTALL_TARGET(nglcoreapplication)
|
||||||
|
|
||||||
|
#
|
||||||
|
# Unit tests
|
||||||
|
#
|
||||||
|
ADD_SUBDIRECTORY(unit-test)
|
||||||
|
|
||||||
#
|
#
|
||||||
# nglsinglecoreapplication
|
# nglsinglecoreapplication
|
||||||
#
|
#
|
||||||
|
|||||||
@@ -30,3 +30,8 @@ NGL_TARGET_INCLUDE_DIRECTORIES(nglsettings
|
|||||||
${CMAKE_CURRENT_SOURCE_DIR}/../
|
${CMAKE_CURRENT_SOURCE_DIR}/../
|
||||||
)
|
)
|
||||||
NGL_INSTALL_TARGET(nglsettings)
|
NGL_INSTALL_TARGET(nglsettings)
|
||||||
|
|
||||||
|
#
|
||||||
|
# Unit tests
|
||||||
|
#
|
||||||
|
ADD_SUBDIRECTORY(unit-test)
|
||||||
@@ -65,3 +65,5 @@ NGL_TARGET_INCLUDE_DIRECTORIES(ngltools
|
|||||||
${CMAKE_CURRENT_SOURCE_DIR}/../
|
${CMAKE_CURRENT_SOURCE_DIR}/../
|
||||||
)
|
)
|
||||||
NGL_INSTALL_TARGET(ngltools)
|
NGL_INSTALL_TARGET(ngltools)
|
||||||
|
|
||||||
|
ADD_SUBDIRECTORY(unit-test)
|
||||||
Reference in new issue
Block a user