Qt6 Migration: DDS-Stubs, Logger-Fixes, Export-Header Korrekturen
- NGL_ADD_LIBRARY2: 87 CMakeLists.txt konvertiert für Export-Header Generierung - 44 Export-Header Include-Pfade korrigiert (_export.h) - 81 DDS-Stub-Header generiert (*_dtc.h, *_fts.h, *_dts.h, *_ftc.h) - INGLLogger: Duplikat gelöscht, m_logger Member entfernt, variadische Makros - Q_FUNC_INFO Redefinition behoben (Qt6 definiert bereits) - FATAL_LOG Makro hinzugefügt - InfrastructureManagement DDS-Stubs (ism.hpp, ism_enums.hpp, ism_ftc.h) - FilterManagement DDS-Stubs (flt_ftc.h, flt_dts.h) - AreaEffectSimulation DDS-Stubs (aes.hpp, aes_enums.hpp) - SymbolAppearance Klasse vollständig definiert mit content() Methode - BuildingComponentFilter Klasse definiert mit Copy-Konstruktor - Ftc Factory: nullptr Return (abstract class) - AesFilter Klasse in aes.hpp hinzugefügt - Dtc Klasse in ppm.hpp mit participantChanged Signal - AesType Enum: alle 15 At* Werte definiert - AesEffectState_def: EsReceived hinzugefügt - DataModification Enum: eAdded/eModified/eRemoved - function_reply_object.h → core_types.h Include-Pfad (72 Dateien) - Enum-Class-Streaming Template-Operator in INGLLogger.h - ism_mounting_point.h: QImage → QtGui/QImage, QGuiApplication/QScreen - ism_data_plugin_interface.h: QSet Include, Include-Reihenfolge - QRegExp → QRegularExpression in tpm_js_parser.cpp - .underlying() Aufrufe zu direktem Enum-Vergleich korrigiert - Include-Pfade: aes.hpp in symbol_appearance_settings_impl.h und aes_display_filter_impl.h Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
2785 files changed
+18754
-18316
No files matched your search
@@ -121,13 +121,20 @@ MACRO (NGL_GET_BUILDPARTS _args _buildopts)
|
||||
SET(${_buildopts} "")
|
||||
SET(_at_least_one_keyword_found OFF)
|
||||
|
||||
MESSAGE(STATUS "DEBUG NGL_GET_BUILDPARTS: BUILD_ALL=${BUILD_ALL}, BUILD_SV=${BUILD_SV}, BUILD_WS=${BUILD_WS}, BUILD_AAR=${BUILD_AAR}")
|
||||
|
||||
LIST(FIND ${_args} "ALL" _all)
|
||||
IF (_all GREATER -1)
|
||||
LIST(REMOVE_AT ${_args} ${_all})
|
||||
SET(_at_least_one_keyword_found ON)
|
||||
FOREACH(_component ${_components})
|
||||
IF(BUILD_${_component})
|
||||
# CMake kann BUILD_${_component} nicht dynamisch auflösen - muss eval() verwenden
|
||||
SET(_varname "BUILD_${_component}")
|
||||
SET(_varvalue ${${_varname}})
|
||||
MESSAGE(STATUS "DEBUG: _component=${_component}, _varname=${_varname}, _varvalue=${_varvalue}")
|
||||
IF(${_varname})
|
||||
LIST(APPEND ${_buildopts} ${_component})
|
||||
MESSAGE(STATUS "DEBUG: Added ${_component} to _buildopts")
|
||||
ENDIF()
|
||||
ENDFOREACH()
|
||||
ELSE()
|
||||
@@ -152,12 +159,15 @@ MACRO (NGL_PARSE_BUILDCOMPONENT_INTERNAL _args _properties _build_target)
|
||||
|
||||
NGL_GET_BUILDPARTS(${_args} _buildopts)
|
||||
SET(${_build_target} OFF)
|
||||
|
||||
MESSAGE(STATUS "DEBUG NGL_PARSE: _buildopts=${_buildopts}, _components=${_components}")
|
||||
|
||||
FOREACH(_component ${_components})
|
||||
LIST(FIND _buildopts ${_component} _idx)
|
||||
IF(_idx GREATER -1)
|
||||
LIST(APPEND ${_properties} NGL_INSTALL_${_component} ON)
|
||||
SET(${_build_target} ON)
|
||||
MESSAGE(STATUS "DEBUG: Set _build_target=ON for component ${_component}")
|
||||
ENDIF()
|
||||
ENDFOREACH()
|
||||
LIST(FIND ${_args} "NO_TRANSLATION" _no_i18n)
|
||||
|
||||
Reference in new issue
Block a user