From 4de31193b65d8f59b40e724f11c5a8800ef2812d Mon Sep 17 00:00:00 2001 From: Torsten Wierschin Date: Thu, 17 Sep 2026 10:22:08 +0000 Subject: [PATCH] Migrates lts/services/f* --- qt6-after/qt6-migrated-legatus/CMakeLists.txt | 2 -- .../CTEST-INTEGRATION-STATUS.md | 18 +++++++++++++ .../Services/FileManagement/CMakeLists.txt | 27 +++++++++++-------- .../qt6-migrated-legatus/tests/CMakeLists.txt | 2 +- 4 files changed, 35 insertions(+), 14 deletions(-) diff --git a/qt6-after/qt6-migrated-legatus/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/CMakeLists.txt index e02a140ff..6937cb80e 100755 --- a/qt6-after/qt6-migrated-legatus/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/CMakeLists.txt @@ -109,8 +109,6 @@ include_directories(${CMAKE_BINARY_DIR}/Lts/Services/ReportManagement) include_directories(${CMAKE_SOURCE_DIR}/include/ReportManagement) include_directories(${CMAKE_BINARY_DIR}/Lts/Services/SituationReplay) include_directories(${CMAKE_SOURCE_DIR}/include/SituationReplay) -include_directories(${CMAKE_BINARY_DIR}/Lts/Services/Buildings) -include_directories(${CMAKE_SOURCE_DIR}/include/Buildings) include_directories(${CMAKE_SOURCE_DIR}/include/Buildings) include_directories(${CMAKE_SOURCE_DIR}/Lts/Proxies/GuezNasat) include_directories(${CMAKE_SOURCE_DIR}/Lts/DDS) diff --git a/qt6-after/qt6-migrated-legatus/CTEST-INTEGRATION-STATUS.md b/qt6-after/qt6-migrated-legatus/CTEST-INTEGRATION-STATUS.md index 303e2decd..b60a09969 100644 --- a/qt6-after/qt6-migrated-legatus/CTEST-INTEGRATION-STATUS.md +++ b/qt6-after/qt6-migrated-legatus/CTEST-INTEGRATION-STATUS.md @@ -82,6 +82,12 @@ Not Run: 27 (6%) ## Known Issues (Non-Critical) +### 0. Buildings Include Directory Warning +**Issue:** `cc1plus: warning: .../build4/Lts/Services/Buildings: No such file or directory` +**Location:** CMake cache (legacy include path) +**Impact:** Cosmetic warning only, no build impact +**Status:** Harmless warning, does not affect build or tests + ### 1. Qt6ApiMigrations.QStringViewBasic Failure **Issue:** Pointer comparison with QStringView not guaranteed **Location:** `tests/test_qt6_api_migrations.cpp` @@ -129,6 +135,16 @@ Not Run: 27 (6%) - **Enums:** `SymbolAppearance`, `SymbolVisibility` - **Status:** Created and integrated +#### flm_enums.hpp +- **Location:** `include/FileManagement/flm_enums.hpp.stub` +- **Type:** Stub file (used when BUILD_RTI=ON) +- **Status:** Present and used correctly + +#### Codegen Pattern +- FileManagement CMakeLists.txt fixed: CONFIGURE_FILE for stub only when BUILD_RTI=OFF +- Include directory order fixed: NGL_TARGET_INCLUDE_DIRECTORIES before CODEGEN_IDL_SVC +- Matches ProjectDataManagement pattern for consistent header generation + #### Other Enum Stubs - ✅ `ppm_enums.hpp.stub` (ParticipantManagement) - ✅ `ism_enums.hpp.stub` (InfrastructureManagement) @@ -141,6 +157,8 @@ Not Run: 27 (6%) - Fixed export header includes to use parent directory pattern - Added NGLLogger and IsmShared include paths - Fixed TrainingAreaBaseOC include directory +- Fixed LtsTimelineClassic include path: `${CMAKE_BINARY_DIR}` → `${CMAKE_SOURCE_DIR}` +- Removed non-existent Buildings include directory from root CMakeLists.txt ### Qt6 API Compatibility ✅ - Fixed `QString("...")` → `QStringLiteral("...")` in all test files diff --git a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/CMakeLists.txt index 5c56da82b..45af337fb 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/CMakeLists.txt @@ -20,6 +20,22 @@ SET(SRCS_common logger.h ) +# Copy flm_enums.hpp.stub to build directory (when BUILD_RTI=OFF) +IF(NOT BUILD_RTI) + CONFIGURE_FILE( + ${CMAKE_SOURCE_DIR}/include/FileManagement/flm_enums.hpp.stub + ${CMAKE_BINARY_DIR}/Lts/Services/FileManagement/flm_enums.hpp + COPYONLY + ) +ENDIF() + +# Add current binary dir to include path for generated headers +NGL_TARGET_INCLUDE_DIRECTORIES(svcFlmCommon + PUBLIC + ${CMAKE_CURRENT_BINARY_DIR}/../ + ${CMAKE_CURRENT_SOURCE_DIR}/../ +) + IF(BUILD_RTI) # Generate flm_enums.idl / flm.idl CODEGEN_IDL_SVC(SRCS_common ${xml_FILE}) @@ -32,12 +48,6 @@ IF(BUILD_RTI) CODEGEN_TOPIC_TYPEDEFS(SRCS_common ${xml_FILE}) # generate flm_[d|f]tc.h CODEGEN_CLIENT_TOPICS_IFC(SRCS_common ${xml_FILE}) -# Stub file for compilation (fallback when no IDL exists) -CONFIGURE_FILE( - ${CMAKE_SOURCE_DIR}/include/FileManagement/flm_enums.hpp.stub - ${CMAKE_BINARY_DIR}/Lts/Services/FileManagement/flm_enums.hpp - COPYONLY -) ELSE() # BUILD_RTI=OFF: Use manual stub headers from include/ LIST(APPEND SRCS_common @@ -48,11 +58,6 @@ ELSE() ENDIF() NGL_ADD_LIBRARY(AAR SV WS svcFlmCommon SHARED ${SRCS_common}) -NGL_TARGET_INCLUDE_DIRECTORIES(svcFlmCommon - PUBLIC - ${CMAKE_CURRENT_SOURCE_DIR}/../ - ${CMAKE_CURRENT_BINARY_DIR}/../ -) NGL_TARGET_LINK_LIBRARIES(svcFlmCommon PRIVATE RTI::nddscpp2 diff --git a/qt6-after/qt6-migrated-legatus/tests/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/tests/CMakeLists.txt index 8f7fb0737..718eb2d2e 100644 --- a/qt6-after/qt6-migrated-legatus/tests/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/tests/CMakeLists.txt @@ -119,7 +119,7 @@ if(BUILD_TESTING) ${CMAKE_BINARY_DIR}/Lts/Common ${CMAKE_BINARY_DIR}/Lts/Common/CodeGen ${CMAKE_BINARY_DIR}/Lts/Common/LtsTimeline - ${CMAKE_BINARY_DIR}/Lts/Common/LtsTimelineClassic + ${CMAKE_SOURCE_DIR}/Lts/Common/LtsTimelineClassic ${CMAKE_BINARY_DIR}/Lts/Services ${CMAKE_SOURCE_DIR}/Z/src/NGLLogger )