diff --git a/qt6-after/qt6-migrated-legatus/Lts/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/CMakeLists.txt index 82dcd1f8c..dc5346cee 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/CMakeLists.txt @@ -15,21 +15,44 @@ else() message(WARNING "Doxygen config ${CMAKE_SOURCE_DIR}/doxygen/DoxyfileLts.in not found; skipping ADD_DOXYGEN_TARGET(Lts)") endif() -# Release scope: only build Lts/Common and Lts/Proxies/TrainingAreaBase (tabTelegrams library) -# Excludes: Tools, Application, DDS, Services, most of Proxies, Plugins, Viewer, Projects -message(STATUS "Building Lts/Common and Lts/Proxies/TrainingAreaBase") -if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/Common") - NGL_ADD_SUBDIR_GUARDED(Common) +# Add only existing subdirectories to allow partial checkouts / incremental migration +# Release 2 scope: Tools, DDS, Common, Services (minimal), Proxies (TrainingAreaBase only), Plugins (Styles only for LtsWidgets dependency) +# Excluded: Application, Viewer, Projects, most Plugins (not in Release 2) +set(LTS_SUBDIRS Tools DDS Common Services Proxies Plugins) +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() - message(STATUS "Skipping missing Lts subdirectory: Common") -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") + message(STATUS "Skipping missing Lts subdirectory: ${dir}") 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/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/Services/PresentationManagement/) + +CODEGEN_WRITE_SERVICEFILE_INFO() diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsAppDescriptor/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsAppDescriptor/CMakeLists.txt index cd3a38b3c..8f67cf885 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsAppDescriptor/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsAppDescriptor/CMakeLists.txt @@ -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 diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCommandLineParser/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCommandLineParser/CMakeLists.txt index 6ae50e437..49348b10d 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCommandLineParser/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCommandLineParser/CMakeLists.txt @@ -19,3 +19,5 @@ NGL_TARGET_LINK_LIBRARIES(LtsCommandLineParser PUBLIC Qt6::Core ) + +ADD_SUBDIRECTORY(unit-test) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCoordTrans/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCoordTrans/CMakeLists.txt index ff7e72a69..cca7708cf 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCoordTrans/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsCoordTrans/CMakeLists.txt @@ -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 $) ENDIF() diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/CMakeLists.txt index 05220ed64..7051cc9a5 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/CMakeLists.txt @@ -8,4 +8,5 @@ ADD_SUBDIRECTORY(LtsUtilsCore) +ADD_SUBDIRECTORY(LtsUtilsGui) ADD_SUBDIRECTORY(LtsUtilsSettings) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/CMakeLists.txt index 76c222f99..1db443f8b 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsCore/CMakeLists.txt @@ -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 $) +ENDIF() diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/CMakeLists.txt index 50e2deee8..08781d614 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/ProjectDataManagement/CMakeLists.txt @@ -193,6 +193,10 @@ ENDIF() # # --- 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 convert_db_to_dds.h dds_handler.cpp @@ -237,6 +241,7 @@ NGL_TARGET_LINK_LIBRARIES(svcProjectDataManagement NGL_INSTALL_TARGET(svcProjectDataManagement) NGL_INSTALL(AAR SV FILES log4cxx_pdm.props DESTINATION bin) NGL_ADD_TARGET_LINK(svcProjectDataManagement sPDM) +ENDIF() # Uncomment if necessary #ADD_SUBDIRECTORY(UnitTests) diff --git a/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/CMakeLists.txt index ab885b4a3..5022bec42 100644 --- a/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/TetraIF/PrtCnv/CMakeLists.txt @@ -5,6 +5,10 @@ # +#ADD_SUBDIRECTORY(TetraTestServer) +ADD_SUBDIRECTORY(LastTest) +ADD_SUBDIRECTORY(LastTestAuswertung) + SET(PrtCnv_SRCS logger.h logger.cpp @@ -59,7 +63,7 @@ NGL_TARGET_LINK_LIBRARIES(PrtCnvLib ) NGL_TARGET_INCLUDE_DIRECTORIES(PrtCnvLib PUBLIC - ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} # prtcnvlib_export.h is generated here ${CMAKE_CURRENT_SOURCE_DIR}/../ ) diff --git a/qt6-after/qt6-migrated-legatus/Z/src/NGLLogger/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Z/src/NGLLogger/CMakeLists.txt index 0aaece8b0..5b97f9f5f 100755 --- a/qt6-after/qt6-migrated-legatus/Z/src/NGLLogger/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Z/src/NGLLogger/CMakeLists.txt @@ -57,5 +57,9 @@ ELSE() MESSAGE(STATUS "Log4Qt not found; skipping test_ngllogger") ENDIF() +# +# Unit tests +# +ADD_SUBDIRECTORY(unit-test) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/log4cxx.props ${CMAKE_BINARY_DIR}/log4cxx.props COPYONLY) diff --git a/qt6-after/qt6-migrated-legatus/Z/src/WMS_Interface/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Z/src/WMS_Interface/CMakeLists.txt index 6263339f2..57134869c 100755 --- a/qt6-after/qt6-migrated-legatus/Z/src/WMS_Interface/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Z/src/WMS_Interface/CMakeLists.txt @@ -33,3 +33,8 @@ NGL_TARGET_LINK_LIBRARIES(wms_json_ds PUBLIC Qt6::Core ) + +# +# Unit tests +# +ADD_SUBDIRECTORY(unit-test) diff --git a/qt6-after/qt6-migrated-legatus/Z/src/nglapplication/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Z/src/nglapplication/CMakeLists.txt index 8eca78e84..e16e5c2c6 100755 --- a/qt6-after/qt6-migrated-legatus/Z/src/nglapplication/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Z/src/nglapplication/CMakeLists.txt @@ -21,6 +21,7 @@ else() set(Qt6_Widgets "") endif() + SET(nglapplication_SRCS nglapplication.cpp nglapplication.h @@ -101,6 +102,11 @@ NGL_TARGET_LINK_LIBRARIES(nglcoreapplication ) NGL_INSTALL_TARGET(nglcoreapplication) +# +# Unit tests +# +ADD_SUBDIRECTORY(unit-test) + # # nglsinglecoreapplication # diff --git a/qt6-after/qt6-migrated-legatus/Z/src/nglsettings/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Z/src/nglsettings/CMakeLists.txt index 227044ce6..81a34fd12 100755 --- a/qt6-after/qt6-migrated-legatus/Z/src/nglsettings/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Z/src/nglsettings/CMakeLists.txt @@ -30,3 +30,8 @@ NGL_TARGET_INCLUDE_DIRECTORIES(nglsettings ${CMAKE_CURRENT_SOURCE_DIR}/../ ) NGL_INSTALL_TARGET(nglsettings) + +# +# Unit tests +# +ADD_SUBDIRECTORY(unit-test) diff --git a/qt6-after/qt6-migrated-legatus/Z/src/ngltools/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Z/src/ngltools/CMakeLists.txt index ed92a7c63..c849975e8 100755 --- a/qt6-after/qt6-migrated-legatus/Z/src/ngltools/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Z/src/ngltools/CMakeLists.txt @@ -65,3 +65,5 @@ NGL_TARGET_INCLUDE_DIRECTORIES(ngltools ${CMAKE_CURRENT_SOURCE_DIR}/../ ) NGL_INSTALL_TARGET(ngltools) + +ADD_SUBDIRECTORY(unit-test)