From f77430bc5f5cb37ac136a97c78d4ea95143c4cb3 Mon Sep 17 00:00:00 2001 From: berrux_dev Date: Tue, 17 Nov 2026 04:11:53 +0100 Subject: [PATCH] Wire the translations dir back into the root CMakeLists NGL_ADD_SUBDIR_GUARDED(translations) after Lts (same position as story/release-validation-scope): translations/CMakeLists.txt reads the global NGL_TS_TARGETS property accumulated by the NGL macros, so it must be added last to see every target. BUILD_TS_FILES is OFF by default (cmake/NGLMacros.cmake), so normal builds are unaffected; with -DBUILD_TS_FILES=ON the dir generates the lupdate .pri files and the update_ts_{en_US,en_GB,de_DE} custom targets. This commit also carries a comment-only cleanup of the file that was already in the working tree (explanatory comment blocks removed; no functional line changed - the RPATH $ORIGIN entries, the test relocation block and the guarded subdirs are all intact). The removed comments are recoverable from the previous revision if wanted. Verified with a throwaway BUILD_TS_FILES=ON configure: 0 errors, all three update_ts_* targets registered, 63 lupdate .pri files generated. The TDS_INSTALL_TRANSLATION (.qm) calls stay commented as in the source. --- qt6-after/qt6-migrated-legatus/CMakeLists.txt | 167 ++---------------- 1 file changed, 12 insertions(+), 155 deletions(-) diff --git a/qt6-after/qt6-migrated-legatus/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/CMakeLists.txt index 649206e13..e25e2a9e6 100755 --- a/qt6-after/qt6-migrated-legatus/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/CMakeLists.txt @@ -47,13 +47,7 @@ include(CTest) # Set RPATH to find libraries in build directory SET(CMAKE_BUILD_RPATH "${CMAKE_BINARY_DIR}/lib") # The RTI Connext libraries live outside the tree (pipeline-root -# external/rti_connext_dds-7.7.0). The absolute path CMake bakes into the -# RUNPATH only resolves on the mount of the build host, so also add a -# $ORIGIN-relative entry (4 levels up from any bin/ or lib/ artifact is -# the pipeline root: the build tree is /qt6-after/ -# build, so bin/ -> build -> qt6-after -> qt-migration-legatus -> root) -# so the binaries load under any mount point (e.g. /workspace) without -# LD_LIBRARY_PATH. +# external/rti_connext_dds-7.7.0). SET(CMAKE_BUILD_RPATH "${CMAKE_BUILD_RPATH};" "$ORIGIN/../../../../external/rti_connext_dds-7.7.0/resource/app/lib/x64Linux4gcc8.5.0") @@ -71,8 +65,6 @@ function(NGL_ADD_SUBDIR_GUARDED subdir) get_filename_component(_mig_base "${_mig}" NAME) get_filename_component(_sub_base "${_sub}" NAME) # If MIGRATE_MODULE either starts with the subdir, equals it, contains it as a path component, - # or the basename matches, include the subdir. This makes nested paths like - # 'Lts/Proxies/TrainingAreaBase' include both 'Lts' and its child 'Proxies'. if(_mig MATCHES "^${_sub}(/|$)" OR _sub MATCHES "^${_mig}(/|$)" OR _mig MATCHES ".*/${_sub}(/|$)" OR _sub MATCHES ".*/${_mig}(/|$)" OR _mig_base STREQUAL _sub OR _sub_base STREQUAL _mig) message(STATUS "Including subdir ${subdir} because MIGRATE_MODULE=${MIGRATE_MODULE}") add_subdirectory(${subdir}) @@ -112,9 +104,7 @@ include_directories(${CMAKE_SOURCE_DIR}/Z/src) include_directories(${CMAKE_SOURCE_DIR}/Z/src) include_directories(${CMAKE_SOURCE_DIR}/Z/src/ngltools) include_directories(${CMAKE_SOURCE_DIR}/Lts/Viewer/SituationMap/Symbology) -# headers (symbol_dictionary.h, sidc_codec.h, ...) are consumed tree-wide -# (e.g. AdvancedSymbology/asb_data_plugin_interface.h is pulled into PpmCommon), so the -# parent dir must be a global root too, not only on the AdvancedSymbology target. + 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. @@ -123,16 +113,7 @@ 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) -# Consumers include generated DDS service headers by service-prefixed name -# (, , ...). Those headers -# live in the per-service BUILD dirs, so the binary Lts/Services ROOT must be -# visible tree-wide (the per-service build dirs below only satisfy the bare -# form). Placed right after the source Lts/Services so a header -# present in both still resolves to the source (binary only supplies the -# generated headers). This mirrors the legacy form. include_directories(${CMAKE_BINARY_DIR}/Lts/Services) -# Generated DDS headers for Proxies (GuezNasat/gna_dtc.h, ...) live under the binary -# Lts/Proxies dir; consumers include them by proxy-prefixed name (). include_directories(${CMAKE_BINARY_DIR}/Lts/Proxies) include_directories(${CMAKE_SOURCE_DIR}/include/ProjectDataManagement) include_directories(${CMAKE_BINARY_DIR}/Lts/Services/InfrastructureManagement) @@ -155,66 +136,35 @@ 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) -# Evaluations' generated evl_db_structs.h includes by bare name, and that -# header is consumed from OcBaseDownload as well, so its build dir must be visible tree-wide -# like the services above. There is no include/Evaluations stub tree, so only the build dir -# is added (same shape as FileManagement above, which has no stub tree either). + include_directories(${CMAKE_BINARY_DIR}/Lts/Services/Evaluations) include_directories(${CMAKE_SOURCE_DIR}/Lts/Proxies/GuezNasat) -# GuezNasat's generated export header (svcgnacommon_export.h) lives in the build dir; -# logger.h includes it by bare name, so the build dir must be visible tree-wide. + include_directories(${CMAKE_BINARY_DIR}/Lts/Proxies/GuezNasat) include_directories(${CMAKE_SOURCE_DIR}/Lts/DDS) include_directories(${CMAKE_SOURCE_DIR}/Lts/DDS/QosProfile) # Generated DDS headers (BUILD_RTI=ON) include_directories(${CMAKE_BINARY_DIR}/Lts) -# consumers (LtsCoordinate, AES/CES, HLA proxies) resolve the -# rtiddsgen-generated core.hpp from the DDS build dir (the qt5 include order); -# the OFF-era stub copies in include/Core/ have been removed. + include_directories(${CMAKE_BINARY_DIR}/Lts/DDS) include_directories(${CMAKE_SOURCE_DIR}/Lts/Common) include_directories(${CMAKE_SOURCE_DIR}/Lts/Common/LtsUtils) include_directories(${CMAKE_BINARY_DIR}/Lts/Common/LtsUtils/LtsUtilsCore) -# LtsUtilsSettings's generated ltsutilssettings_export.h is included by bare name from -# settings.h. Consumer targets that reach settings.h transitively (without linking -# LtsUtilsSettings themselves) cannot see it through the target's PUBLIC interface, so the -# directory holding the generated header has to be visible tree-wide. The directory contains -# only that generated header, so appending it cannot shadow an existing include. include_directories(${CMAKE_BINARY_DIR}/Lts/Common/LtsUtils/LtsUtilsSettings) -# LtsUtilsGui ConnectDialog's generated ltsutilsguiconnectdialog_export.h is included by bare -# name from connect_dialog.h / connect_dialog_nt.h; same tree-wide visibility as the dirs above. include_directories(${CMAKE_BINARY_DIR}/Lts/Common/LtsUtils/LtsUtilsGui/ConnectDialog) -# DDSConnector's generated ddsconnector_export.h is included by bare name from -# dds_connector.h and pub_sub_base.h, and reaches targets (the AES ModuleTests) that include -# DDSConnector headers without linking ddsconnector. Same shape as LtsUtilsSettings above: the -# directory holds only the generated header. include_directories(${CMAKE_BINARY_DIR}/Lts/DDS/DDSConnector) -# The generated msg_db_structs.h includes by bare name, and Messaging is -# reached transitively from OcBaseDownload and the proxy handlers, so its build dir must be -# visible tree-wide like the services above. Unlike them there is no include/Messaging stub -# tree, so only the build dir is added. 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) -# The generated opm_db_structs.h includes by bare name and is reached -# transitively from OcBaseDownload, so the OperatorManagement build dir has to be visible -# tree-wide next to its include/ stub tree above. + include_directories(${CMAKE_BINARY_DIR}/Lts/Services/OperatorManagement) -# The plugin interface headers live under Lts/Plugins// and are included both as -# /x.h> (the qt5 spelling, resolved through the Lts/ root) and, since the -# migration dropped the leading segment, as /x.h>. Lts/Plugins is therefore needed on -# the path. It is appended last so it can only ever resolve includes that were unresolvable -# before: every include that resolves today is found in an earlier directory, so no existing -# resolution can change. + include_directories(${CMAKE_SOURCE_DIR}/Lts/Plugins) SET(CMAKE_CXX_STANDARD 17) SET(CMAKE_CXX_STANDARD_REQUIRED ON) SET(CMAKE_VISIBILITY_INLINES_HIDDEN ON) SET(CMAKE_CXX_VISIBILITY_PRESET hidden) -# Qt6 Migration: Removed CMAKE_POSITION_INDEPENDENT_CODE - Qt6 handles PIC automatically -# and this setting conflicts with Qt6's reduce_relocations feature -# SET(CMAKE_POSITION_INDEPENDENT_CODE ON) IF(CMAKE_VERSION VERSION_GREATER 3.15.9) OPTION(USE_UNITY_BUILDS "Use Unity builds to speed up compilation (cmake 3.16 or newer required!)" OFF) @@ -224,8 +174,6 @@ IF(CMAKE_VERSION VERSION_GREATER 3.15.9) ENDIF() ENDIF() -# Qt6 Migration: Options to disable modules with missing dependencies (WebEngine, XmlPatterns, ArcGIS) -# These can be enabled once the required system dependencies are available in the build environment OPTION(BUILD_PLUGINS_PLANEDITOR "Build PlanEditor plugin (requires Qt6 WebEngine + ArcGIS SDK)" OFF) OPTION(BUILD_PLUGINS_ONLINEHELP "Build OnlineHelp plugin (requires Qt6 WebEngine)" OFF) OPTION(BUILD_PLUGINS_SERVICEMONITOR "Build ServiceMonitor plugin (requires Qt6 WebEngine)" OFF) @@ -240,10 +188,6 @@ IF(BUILD_RTI) # Define BUILD_RTI as preprocessor macro for all targets ADD_COMPILE_DEFINITIONS(BUILD_RTI) # External (RTI) DDS is available: compile the BUILD_WITH_EXTERNAL_DDS code paths - # (used by 73 guards across plugins, e.g. MrkCommon's MarkerManagementDialogModel / - # CustomViewMarker). Legacy always compiled this DDS code; the flag is a migration - # option that was never wired into CMake, so its absence silently dropped the - # definitions while the unguarded class declarations still referenced them (link error). ADD_COMPILE_DEFINITIONS(BUILD_WITH_EXTERNAL_DDS) ENDIF() OPTION(BUILD_ARCGIS "Build ArcGIS SDK dependent modules" ON) @@ -251,8 +195,6 @@ OPTION(BUILD_FILTERMANAGEMENT "Build FilterManagement plugins (temporarily disab OPTION(BUILD_CODIFICATION "Build CodificationManagement plugins (requires KDReports)" OFF) OPTION(BUILD_GRANTLEE "Build CodeGen SQL files using KTextTemplate parser (KF6::TextTemplate)" ON) -# If BUILD_GRANTLEE is OFF but ngl_codegen is needed (for IDL codegen), -# provide it as an imported executable target from pre-built location IF(NOT BUILD_GRANTLEE) # ngl_codegen is copied to build/bin/ by run_final_migration.sh # Create an imported target so MacroCodeGenIdl.cmake can find it @@ -337,8 +279,6 @@ SET(QT_USE_IMPORTED_TARGETS TRUE) # Check for OpenGL first (required by Qt6Gui) find_package(OpenGL) -# Prefer Qt6, fallback to Qt5. Create Qt6::*-aliases when Qt6 is found so existing CMakeLists continue to work. -# Try to find Qt6 with GUI components first set(QT6_GUI_AVAILABLE FALSE) set(QT6_FOUND FALSE) set(QT6_CORE5COMPAT_AVAILABLE FALSE) @@ -350,10 +290,6 @@ if(Qt6Core5Compat_FOUND) message(STATUS "Found Qt6Core5Compat") endif() -# Find Qt6 core components first (without OpenGL which may not be available) -# WebSockets is required by the migrated services (FileManagement's THP script -# server uses QWebSocketServer; LtsWebSocket/httq enable their real websocket -# paths via QT6_WEBSOCKETS_AVAILABLE when the module is found). find_package(Qt6 6.2 COMPONENTS Concurrent Core LinguistTools Network Multimedia Sql SerialPort Test Xml Positioning Svg WebSockets PrintSupport OpenGL OpenGLWidgets QUIET) @@ -387,22 +323,10 @@ endif() # Qt State Machine (QState/QStateMachine) was moved out of QtGui in Qt6 into the # separate "Qt State Machine" add-on (the qtscxml package). In Qt5 the state -# machine classes lived inside QtGui/QtCore, so the ExerciseManagement state -# machines (exercise_state_base/exercise_state_machine) compiled without an -# explicit StateMachine dependency. Probe for the module now; if present the -# affected targets link Qt6::StateMachine (guarded per-target below). +# machine classes lived inside QtGui/QtCore find_package(Qt6 6.2 COMPONENTS StateMachine QUIET) -# Create imported targets for all available Qt6 libraries -# Use Qt6 installation path from find_package or fall back to system paths if(Qt6Core_DIR) - # is the cmake package dir: /lib/cmake/Qt6Core in the - # standard Qt layout and //cmake/Qt6Core in the Debian/ - # Ubuntu layout — so the library dir is two levels up in both. (Going three - # levels up and appending /lib only matches the standard layout; in the - # Debian validation container it resolved to /usr/lib/lib and every manual - # target below was silently skipped, breaking all targets linking - # Qt6::Sql / Qt6::Xml / Qt6::Test.) get_filename_component(QT6_LIB_DIR "${Qt6Core_DIR}/../.." ABSOLUTE) get_filename_component(QT6_ARCH_DIR "${QT6_LIB_DIR}" NAME) # The standard layout keeps headers in /include; Debian/Ubuntu keeps @@ -440,14 +364,10 @@ if(NOT TARGET Qt6::Gui AND EXISTS "${QT6_LIB_DIR}/libQt6Gui.so.6") ) endif() -# Set variable for legacy code that uses ${Qt6_Gui} — like Qt6_Widgets below, -# subdirectory CMakeLists contain `set(Qt6_Gui ${Qt6_Gui})` optional-guard -# no-ops that keep this root-scope value. if(TARGET Qt6::Gui) set(Qt6_Gui Qt6::Gui) endif() -# Qt6::Widgets - create manual target (find_package fails without OpenGL) if(EXISTS "${QT6_LIB_DIR}/libQt6Widgets.so.6") if(NOT TARGET Qt6::Widgets) add_library(Qt6::Widgets SHARED IMPORTED) @@ -474,9 +394,6 @@ if(NOT TARGET Qt6::OpenGL AND EXISTS "${QT6_LIB_DIR}/libQt6OpenGL.so.6") message(STATUS "Manually configured Qt6 OpenGL target") endif() -# Qt6::OpenGLWidgets - create manual target if not found -# (QOpenGLWidget, used by the ArcGIS SDK MapGraphicsView/SceneGraphicsView objects; -# Qt6 splits QOpenGLWidget into its own libQt6OpenGLWidgets.so) if(NOT TARGET Qt6::OpenGLWidgets AND EXISTS "${QT6_LIB_DIR}/libQt6OpenGLWidgets.so.6") add_library(Qt6::OpenGLWidgets SHARED IMPORTED) set_target_properties(Qt6::OpenGLWidgets PROPERTIES @@ -552,10 +469,6 @@ if(NOT TARGET Qt6::Multimedia) endif() # Qt6::Svg - create manual target if not found. Also require the headers: -# the container can ship the runtime library (libqt6svg6 via Recommends) -# without qt6-svg-dev, and an imported target with a non-existent -# INTERFACE_INCLUDE_DIRECTORIES entry fails the CMake generate step for -# every Svg consumer. Without headers the stub below is used instead. if(NOT TARGET Qt6::Svg AND EXISTS "${QT6_LIB_DIR}/libQt6Svg.so.6" AND EXISTS "${QT6_INC_DIR}/QtSvg") add_library(Qt6::Svg SHARED IMPORTED) set_target_properties(Qt6::Svg PROPERTIES @@ -593,8 +506,6 @@ if(NOT TARGET Qt6::SerialPort) endif() # Qt6::WebEngineCore - real imported target if the library exists (stub below otherwise). -# The stub carries no library, so targets linking it (e.g. SmoSystemMonitorGuiPlugin) -# fail --no-undefined on QWebEngine* symbols. if(NOT TARGET Qt6::WebEngineCore AND EXISTS "${QT6_LIB_DIR}/libQt6WebEngineCore.so.6") add_library(Qt6::WebEngineCore SHARED IMPORTED) set_target_properties(Qt6::WebEngineCore PROPERTIES @@ -635,8 +546,6 @@ if(NOT TARGET Qt6::WebEngineWidgets) endif() # Stub KDReports::KDReports target if not available (needed by LtsReportDisplay) -# UNKNOWN (not INTERFACE) so FindKDReports.cmake can upgrade it with a real -# IMPORTED_LOCATION; an INTERFACE imported target ignores IMPORTED_LOCATION. if(NOT TARGET KDReports::KDReports) add_library(KDReports::KDReports UNKNOWN IMPORTED) set_target_properties(KDReports::KDReports PROPERTIES @@ -654,10 +563,7 @@ if(NOT TARGET Qt6::Core5Compat) message(STATUS "Created stub target for Qt6::Core5Compat (library not available)") endif() -# Qt6::WebSockets - create manual target if not found (the container's Qt6 -# discovery takes the minimal path, so find_package never creates the -# component targets). The migrated FileManagement service (THP script -# server) needs the real module. +# Qt6::WebSockets - create manual target if not found if(NOT TARGET Qt6::WebSockets AND EXISTS "${QT6_LIB_DIR}/libQt6WebSockets.so.6") add_library(Qt6::WebSockets SHARED IMPORTED) set_target_properties(Qt6::WebSockets PROPERTIES @@ -718,17 +624,12 @@ if(NOT TARGET Qt6::OpenGL) message(STATUS "Created stub target for Qt6::OpenGL (library not available)") endif() -# Set variable for legacy code that uses ${Qt6_WebSockets} — subdirectory -# CMakeLists contain `set(Qt6_WebSockets ${Qt6_WebSockets})` optional-guard -# no-ops that keep this root-scope value. if(TARGET Qt6::WebSockets) set(Qt6_WebSockets Qt6::WebSockets) endif() # The real Qt6 WebSockets module is available (either via find_package or the -# manual import above): enable the real websocket code paths in httq, -# LtsWebSocket and the migrated services (they check this macro; without it -# they fall back to websocket-less operation). +# manual import above): if(Qt6WebSockets_FOUND OR QT6_WEBSOCKETS_REAL_FOUND) add_compile_definitions(QT6_WEBSOCKETS_AVAILABLE) endif() @@ -770,11 +671,6 @@ IF(BUILD_RTI) SET(RTI_LIB_DIR "${RTI_INSTALL_DIR}/lib/x64Linux4gcc8.5.0") SET(RTI_INCLUDE_DIR "${RTI_INSTALL_DIR}/include/ndds/hpp") - # RTI hat vier Include-Pfade: - # - include/ für ndds/... und andere Top-Level Headers (z.B. ndds/ndds_config_common.h) - # - include/ndds/ für osapi/... Headers (z.B. osapi/osapi_platform.h) - # - include/ndds/hpp für C++ Headers (dds/..., rti/...) - # - include/rti für rti/... Headers SET(RTI_INCLUDE_DIRS "${RTI_INSTALL_DIR}/include" "${RTI_INSTALL_DIR}/include/ndds" @@ -789,45 +685,18 @@ IF(BUILD_RTI) SET(CMAKE_AUTOMOC_INCLUDE_DIRECTORIES ${CMAKE_AUTOMOC_INCLUDE_DIRECTORIES} ${RTI_INCLUDE_DIRS}) # The generated _topic_type_plugin.h / _record_replay_plugin.h - # headers use Q_INTERFACES(DDSGeneric::TopicTypePlugin), so moc must see - # the Q_DECLARE_INTERFACE in Lts/DDS/... (resolved through the Lts include - # root). Without this path every TopicTypePlugin fails with - # "Undefined interface" even though the compiler sees the header. SET(CMAKE_AUTOMOC_INCLUDE_DIRECTORIES ${CMAKE_AUTOMOC_INCLUDE_DIRECTORIES} ${CMAKE_SOURCE_DIR}/Lts) # The ElevationMapManager stub header (include/Viewer/SituationMap/ElevationMap/) - # lives apart from its source (src/...), so moc needs its directory explicitly. - # NOTE: this must be set at root scope - subdir-scope appends do not reach - # the AutogenInfo MOC_INCLUDES. SET(CMAKE_AUTOMOC_INCLUDE_DIRECTORIES ${CMAKE_AUTOMOC_INCLUDE_DIRECTORIES} ${CMAKE_SOURCE_DIR}/include/Viewer/SituationMap/ElevationMap) # The migrated Projects declare Q_INTERFACES(ProjectPlugin::Plugin) and include - # . That include dir - # (Lts/Common/PluginInterfaces/..) is only a target-level PUBLIC include of - # ProjectPluginInterface and is NOT part of the global include_directories that - # reach the AutogenInfo MOC_INCLUDES, so moc fails with "Undefined interface". - # Add the Lts/Common root explicitly (mirrors the Lts append above) so moc can - # resolve the interface. Must be set at root scope - subdir appends do not - # reach the AutogenInfo MOC_INCLUDES. + # . SET(CMAKE_AUTOMOC_INCLUDE_DIRECTORIES ${CMAKE_AUTOMOC_INCLUDE_DIRECTORIES} ${CMAKE_SOURCE_DIR}/Lts/Common) # The TrainingAreaBase tab plugins (tabPluginHla / tabPluginWlsTetra / - # tabPluginDebugJsonDir / ...) declare Q_INTERFACES(TrainingAreaBase::Plugin::Plugin) - # and include . That include dir - # (Lts/Proxies) is only a target-level INTERFACE include of tabPluginInterface and - # is NOT part of the global include_directories that reach the AutogenInfo - # MOC_INCLUDES, so moc fails with "Undefined interface". Add the Lts/Proxies root - # explicitly so moc can resolve the interface. Must be set at root scope - subdir - # appends do not reach the AutogenInfo MOC_INCLUDES. SET(CMAKE_AUTOMOC_INCLUDE_DIRECTORIES ${CMAKE_AUTOMOC_INCLUDE_DIRECTORIES} ${CMAKE_SOURCE_DIR}/Lts/Proxies) - # Designer plugins (ltswidgetsplugin) declare Q_INTERFACES(QDesignerCustomWidgetInterface) - # and include . That interface's - # Q_DECLARE_INTERFACE lives in the Qt6 QtUiPlugin module, which moc cannot resolve - # without the Qt6 parent include dir (it is only a target-level INTERFACE include of - # Qt6::UiTools and does not reach the global AutogenInfo MOC_INCLUDES). Add Qt6::Core's - # interface include dirs (which expose the /header root) so moc finds the - # interface. Must be set at root scope. get_target_property(_qt6_autmoc_incs Qt6::Core INTERFACE_INCLUDE_DIRECTORIES) SET(CMAKE_AUTOMOC_INCLUDE_DIRECTORIES ${CMAKE_AUTOMOC_INCLUDE_DIRECTORIES} ${_qt6_autmoc_incs}) @@ -1116,24 +985,12 @@ NGL_ADD_SUBDIR_GUARDED(Z/src) # Services are included before plugins via Lts/CMakeLists.txt (LTS_SUBDIRS order) NGL_ADD_SUBDIR_GUARDED(Lts) -# TrainingAreaBase is included via Lts/Proxies when Lts is processed. -# (Out-of-scope dirs tests/, translations/ and Lts/Plugins/ProjectDataManagement -# were removed from this branch; their add_subdirectory calls are gone with them.) +NGL_ADD_SUBDIR_GUARDED(translations) #----------------------------------------------------------------------------------------------------- # # --- Relayout: all test / ctest executables go to bin/unit-test -------------- # -# Naming convention: test_* | *_test | *_smoke | *Tests (module test apps -# such as pdmTests). The target property overrides the global -# EXECUTABLE_OUTPUT_PATH (bin/) set above. add_test() entries use -# $, so the ctest registry follows the new location -# automatically. -# -# The global RTI RUNPATH $ORIGIN entry (4 levels up) is correct for bin/ -# artifacts; from bin/unit-test/ the RTI libs are 5 levels up, so test -# executables additionally get a target-specific BUILD_RPATH entry. (Dead -# entries pointing at nonexistent dirs are harmless - the loader skips them.) FILE(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/bin/unit-test") # Collect the targets defined in this directory and all of its subdirectories. # (The global property TARGETS is empty in CMake 4.x, so walk the directory