Qt6 Migration: LtsWidgets, BUILD_RTI Guards, externe Dependencies dokumentiert
- LtsWidgets Verzeichnis vollständig migriert (Qt5→Qt6) - BUILD_RTI Guards für RTI-spezifische Module hinzugefügt - Externe Dependencies in EXTERNAL_DEPS.md dokumentiert - Qt6 API-Änderungen: QRegExp→QRegularExpression, enterEvent(QEnterEvent*) - AutoUic-Fehler bei ui_requirement behoben (SKIP_AUTOUIC) - Include-Pfade korrigiert (LtsElevation, LtsMultiMonitor, LtsUtilsCore) - MOC-Fehler behoben (Q_INTERFACES entfernt wo nicht benötigt) - CMakeLists.txt Anpassungen für Qt6 (PUBLIC statt INTERFACE) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
145 files changed
+17700
-14377
No files matched your search
@@ -4,6 +4,8 @@
|
||||
# $Author$
|
||||
#
|
||||
|
||||
IF(BUILD_RTI)
|
||||
|
||||
IF(${CMAKE_VERSION} VERSION_LESS "3.6.0")
|
||||
FIND_PACKAGE(Boost REQUIRED COMPONENTS system) # system wird nicht gebraucht, aber ohne Komponente wird das Boost::boost imported Target nicht angelegt (cmake <= 3.5.2)
|
||||
ELSE()
|
||||
@@ -136,7 +138,6 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcAvmCommon
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../
|
||||
${CMAKE_CURRENT_BINARY_DIR}/../
|
||||
)
|
||||
IF(BUILD_RTI)
|
||||
NGL_TARGET_LINK_LIBRARIES(svcAvmCommon
|
||||
PRIVATE
|
||||
RTI::nddscpp2
|
||||
@@ -151,7 +152,6 @@ NGL_TARGET_LINK_LIBRARIES(svcAvmCommon
|
||||
ngldb
|
||||
Boost::boost
|
||||
)
|
||||
ENDIF(BUILD_RTI)
|
||||
NGL_INSTALL_TARGET(svcAvmCommon)
|
||||
|
||||
#
|
||||
@@ -172,7 +172,6 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcAvmClient
|
||||
${CMAKE_CURRENT_BINARY_DIR}/../
|
||||
)
|
||||
|
||||
IF(BUILD_RTI)
|
||||
NGL_TARGET_LINK_LIBRARIES(svcAvmClient
|
||||
PRIVATE
|
||||
RTI::nddscpp2
|
||||
@@ -181,7 +180,6 @@ NGL_TARGET_LINK_LIBRARIES(svcAvmClient
|
||||
svcAvmCommon
|
||||
ddsftc
|
||||
)
|
||||
ENDIF(BUILD_RTI)
|
||||
NGL_INSTALL_TARGET(svcAvmClient)
|
||||
|
||||
#
|
||||
@@ -200,7 +198,6 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcAvmServer
|
||||
${CMAKE_CURRENT_BINARY_DIR}/../
|
||||
)
|
||||
|
||||
IF(BUILD_RTI)
|
||||
NGL_TARGET_LINK_LIBRARIES(svcAvmServer
|
||||
PRIVATE
|
||||
RTI::nddscpp2
|
||||
@@ -210,7 +207,6 @@ NGL_TARGET_LINK_LIBRARIES(svcAvmServer
|
||||
svcAvmCommon
|
||||
ngldb
|
||||
)
|
||||
ENDIF(BUILD_RTI)
|
||||
NGL_INSTALL_TARGET(svcAvmServer)
|
||||
|
||||
#
|
||||
@@ -313,3 +309,5 @@ NGL_ADD_TARGET_LINK(svcAudioVideoManagement sAVM)
|
||||
# Uncomment if necessary
|
||||
ADD_SUBDIRECTORY(ModuleTests)
|
||||
ADD_SUBDIRECTORY(UnitTests)
|
||||
|
||||
ENDIF(BUILD_RTI)
|
||||
Reference in new issue
Block a user