Qt6 Migration: BUILD_RTI Guards, Export-Header und Include-Pfade korrigiert
- BUILD_RTI Guards in LtsSession implementiert (6 Dateien) - LtsSessionDataDds Stub für BUILD_RTI=OFF erstellt - Export-Header Stubs erstellt (GuezNasat, AlarmManagement, MarkerManagement) - Include-Pfade korrigiert (resource_path.h, logger.h, Proxies) - QStringRef → QString migriert (Qt6 Kompatibilität) - Qt6::Gui Dependencies hinzugefügt (LtsElevation, AdvancedSymbology) - FilterManagement-Plugins temporär vom Build ausgeschlossen - MOC-Probleme gefixt (staticMetaObject, override final) - Build erfolgreich: 1940 Targets mit BUILD_RTI=OFF im Docker-Container Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
46 files changed
+2487
-110
No files matched your search
@@ -26,6 +26,22 @@ IF(BUILD_RTI)
|
||||
NGLLogger
|
||||
Qt6::Core
|
||||
)
|
||||
ELSE()
|
||||
# Stub version for BUILD_RTI=OFF
|
||||
SET(LtsSessionDataDds_SRCS
|
||||
lts_session_data_dds_stub.cpp
|
||||
lts_session_data_dds_stub.h
|
||||
)
|
||||
NGL_ADD_LIBRARY2(WS LtsSessionDataDds SHARED ${LtsSessionDataDds_SRCS})
|
||||
NGL_TARGET_INCLUDE_DIRECTORIES(LtsSessionDataDds
|
||||
PUBLIC
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../
|
||||
${CMAKE_CURRENT_BINARY_DIR}/../
|
||||
)
|
||||
NGL_TARGET_LINK_LIBRARIES(LtsSessionDataDds
|
||||
PUBLIC
|
||||
Qt6::Core
|
||||
)
|
||||
ENDIF()
|
||||
|
||||
|
||||
@@ -35,11 +51,13 @@ SET(ltssession_SRCS
|
||||
lts_session.h
|
||||
lts_session.cpp
|
||||
lts_session_lock_handler.h
|
||||
lts_session_manager.h
|
||||
lts_session_manager.cpp
|
||||
lts_session_lock_handler.cpp
|
||||
)
|
||||
|
||||
# lts_session_manager and lts_session_lock_handler.cpp only needed when BUILD_RTI=ON
|
||||
IF(BUILD_RTI)
|
||||
LIST(APPEND ltssession_SRCS lts_session_manager.h lts_session_manager.cpp lts_session_lock_handler.cpp)
|
||||
ENDIF()
|
||||
|
||||
NGL_ADD_LIBRARY2(WS LtsSession SHARED ${ltssession_SRCS})
|
||||
NGL_TARGET_INCLUDE_DIRECTORIES(LtsSession
|
||||
PUBLIC
|
||||
@@ -48,16 +66,28 @@ NGL_TARGET_INCLUDE_DIRECTORIES(LtsSession
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../LtsUtils/LtsUtilsGui
|
||||
)
|
||||
|
||||
NGL_TARGET_LINK_LIBRARIES(LtsSession
|
||||
PRIVATE
|
||||
# Optional external dependencies
|
||||
FIND_LIBRARY(SVCCORECLIENT_LIBRARY NAMES svcCoreClient PATHS /usr/local/lib /usr/lib NO_DEFAULT_PATH)
|
||||
FIND_LIBRARY(OHPONLINEHELP_LIBRARY NAMES OhpOnlineHelpViewerGuiPluginInterface PATHS /usr/local/lib /usr/lib NO_DEFAULT_PATH)
|
||||
|
||||
SET(LtsSession_PRIVATE_LIBS
|
||||
Qt6::Network
|
||||
LtsMultiMonitor
|
||||
LtsSessionData
|
||||
LtsUtilsGuiDds # ReqHelpr & for Debug Menu ! TODO: rm on release!
|
||||
LtsNotification
|
||||
svcCoreClient # Core Ftc - for TLH
|
||||
OhpOnlineHelpViewerGuiPluginInterface
|
||||
Qt6::Svg
|
||||
)
|
||||
IF(SVCCORECLIENT_LIBRARY)
|
||||
LIST(APPEND LtsSession_PRIVATE_LIBS ${SVCCORECLIENT_LIBRARY})
|
||||
ENDIF()
|
||||
IF(OHPONLINEHELP_LIBRARY)
|
||||
LIST(APPEND LtsSession_PRIVATE_LIBS ${OHPONLINEHELP_LIBRARY})
|
||||
ENDIF()
|
||||
|
||||
NGL_TARGET_LINK_LIBRARIES(LtsSession
|
||||
PRIVATE
|
||||
${LtsSession_PRIVATE_LIBS}
|
||||
PUBLIC
|
||||
LtsWidgets
|
||||
Qt6::Core
|
||||
|
||||
Reference in new issue
Block a user