From d4ff991330e7993e6799fc41ce6d99d0e01f43fe Mon Sep 17 00:00:00 2001 From: berrux_dev Date: Tue, 17 Nov 2026 13:46:20 +0100 Subject: [PATCH] Remove remaining stale include_directories for pruned modules Follow-up to the FileManagement cleanup: an audit of every include_directories() in the tree resolved each path against the source and a fully-built build dir. The pruned Lts/Viewer (SituationMap, LtsDataView, Symbology), the LtsUtilsGui/ConnectDialog codegen dir, the pruned Messaging/OperatorManagement services, and the plugin-level AudioVideoManagement/GuezNasat/TopicEditorBase/OperatorManagement/LtsDataView entries all pointed at paths that do not exist, so each one only emitted -Wmissing-include-dirs warnings. A missing -I dir cannot provide any header, so the removals are functionally neutral. The audit now reports zero missing include dirs. --- qt6-after/qt6-migrated-legatus/CMakeLists.txt | 14 -------------- .../Lts/Plugins/CMakeLists.txt | 15 +++------------ 2 files changed, 3 insertions(+), 26 deletions(-) diff --git a/qt6-after/qt6-migrated-legatus/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/CMakeLists.txt index ef0a31f59..d21d31aba 100755 --- a/qt6-after/qt6-migrated-legatus/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/CMakeLists.txt @@ -103,13 +103,6 @@ include_directories(${CMAKE_SOURCE_DIR}/Z/src) # Include directories for external dependencies and internal modules include_directories(${CMAKE_SOURCE_DIR}/Z/src) include_directories(${CMAKE_SOURCE_DIR}/Z/src/ngltools) -include_directories(${CMAKE_SOURCE_DIR}/Lts/Viewer/SituationMap/Symbology) - -include_directories(${CMAKE_SOURCE_DIR}/Lts/Viewer/SituationMap) -# Generated SymbologyGui/advancedsymbologygui_export.h lives in the build dir; the source -# SituationMap root above only covers the source Symbology headers. -include_directories(${CMAKE_BINARY_DIR}/Lts/Viewer/SituationMap) -include_directories(${CMAKE_SOURCE_DIR}/Lts/Viewer/LtsDataView) include_directories(${CMAKE_SOURCE_DIR}/Lts/Proxies/TrainingAreaBase) include_directories(${CMAKE_BINARY_DIR}/Lts/Services/ProjectDataManagement) include_directories(${CMAKE_SOURCE_DIR}/Lts/Services) @@ -128,15 +121,8 @@ include_directories(${CMAKE_SOURCE_DIR}/Lts/Common) include_directories(${CMAKE_SOURCE_DIR}/Lts/Common/LtsUtils) include_directories(${CMAKE_BINARY_DIR}/Lts/Common/LtsUtils/LtsUtilsCore) include_directories(${CMAKE_BINARY_DIR}/Lts/Common/LtsUtils/LtsUtilsSettings) -include_directories(${CMAKE_BINARY_DIR}/Lts/Common/LtsUtils/LtsUtilsGui/ConnectDialog) include_directories(${CMAKE_BINARY_DIR}/Lts/DDS/DDSConnector) -include_directories(${CMAKE_BINARY_DIR}/Lts/Services/Messaging) include_directories(${CMAKE_SOURCE_DIR}/Z/src/NGLLogger) -include_directories(${CMAKE_SOURCE_DIR}/include/Viewer/SituationMap) -include_directories(${CMAKE_SOURCE_DIR}/include/OperatorManagement) - -include_directories(${CMAKE_BINARY_DIR}/Lts/Services/OperatorManagement) - include_directories(${CMAKE_SOURCE_DIR}/Lts/Plugins) SET(CMAKE_CXX_STANDARD 17) SET(CMAKE_CXX_STANDARD_REQUIRED ON) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CMakeLists.txt index 72f236f88..f1607658a 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Plugins/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/Plugins/CMakeLists.txt @@ -6,22 +6,13 @@ # Add Services directory to include path for all plugins INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../Services/) -# Add AudioVideoManagement stub headers for non-RTI builds -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../include/AudioVideoManagement/) -# Add GuezNasat for logger.h (only with BUILD_RTI) -IF(BUILD_RTI) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../Proxies/GuezNasat/) -ENDIF() -# Add Viewer/LtsDataView for abstract_display_widget.h -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../Viewer/LtsDataView/) -# Add OperatorManagement stub headers for non-FilterManagement builds -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../include/OperatorManagement/) +# (Stale include_directories for Release-2-pruned modules - AudioVideoManagement, +# GuezNasat, Viewer/LtsDataView, OperatorManagement, TopicEditorBase - removed: +# the paths no longer exist and only produced -Wmissing-include-dirs warnings.) # Add NGLLogger stub headers INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../include/NGLLogger/) # Add LtsSession stub headers INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../include/LtsSession/) -# Add TopicEditorBase stub headers -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../include/TopicEditorBase/) # Release 2: Only Styles plugin needed for LtsWidgets dependency (TabBarTabStyle) ADD_SUBDIRECTORY(Styles)