Adds latest migration results
This commit is contained in:
829 files changed
+35074
-70886
No files matched your search
@@ -201,42 +201,177 @@ macro_ensure_out_of_source_build("In-Source build nicht erlaubt!")
|
||||
SET(CMAKE_AUTOMOC TRUE)
|
||||
SET(CMAKE_AUTOUIC TRUE)
|
||||
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.
|
||||
# Find Qt6 with all required components in one call to ensure all targets are properly created
|
||||
find_package(Qt6 6.8 COMPONENTS Concurrent Core Core5Compat Gui LinguistTools Network OpenGL PrintSupport
|
||||
Multimedia Sql Svg SerialPort Test UiTools WebSockets WebEngineCore WebEngineWidgets
|
||||
Widgets Xml Positioning REQUIRED)
|
||||
find_package(Qt6 COMPONENTS Location Sensors XmlPatterns OPTIONAL)
|
||||
if(Qt6_FOUND)
|
||||
message(STATUS "Found Qt6: ${Qt6Core_VERSION}")
|
||||
# Map version variable for compatibility if available
|
||||
if(Qt6Core_VERSION)
|
||||
set(Qt5Core_VERSION ${Qt6Core_VERSION} CACHE INTERNAL "Compatibility Qt5Core_VERSION mapped from Qt6")
|
||||
endif()
|
||||
# Find rcc/lrelease programs as compatibility fallbacks
|
||||
find_program(_rcc_exec rcc-qt6 rcc)
|
||||
if(_rcc_exec)
|
||||
set(Qt5Core_RCC_EXECUTABLE ${_rcc_exec} CACHE INTERNAL "Compatibility rcc executable")
|
||||
endif()
|
||||
find_program(_lrelease_exec lrelease-qt6 lrelease)
|
||||
if(_lrelease_exec)
|
||||
set(Qt5_LRELEASE_EXECUTABLE ${_lrelease_exec} CACHE INTERNAL "Compatibility lrelease executable")
|
||||
if(TARGET Qt6::LinguistTools AND NOT TARGET Qt6::lrelease)
|
||||
add_executable(Qt6::lrelease IMPORTED)
|
||||
set_target_properties(Qt6::lrelease PROPERTIES IMPORTED_LOCATION ${Qt5_LRELEASE_EXECUTABLE})
|
||||
endif()
|
||||
endif()
|
||||
else()
|
||||
find_package(Qt6 6.10.2 COMPONENTS Concurrent Core Core5Compat Gui LinguistTools
|
||||
Network OpenGL PrintSupport Multimedia
|
||||
Sql Svg SerialPort Test UiTools WebSockets
|
||||
Widgets Xml Positioning
|
||||
REQUIRED)
|
||||
find_package(Qt6 COMPONENTS Location Sensors WebEngineCore WebEngineWidgets XmlPatterns Core5Compat OPTIONAL)
|
||||
MESSAGE(STATUS "Qt version is ${Qt6Core_VERSION}")
|
||||
# Try to find Qt6 with GUI components first
|
||||
set(QT6_GUI_AVAILABLE FALSE)
|
||||
set(QT6_FOUND FALSE)
|
||||
set(QT6_CORE5COMPAT_AVAILABLE FALSE)
|
||||
|
||||
# First check if Core5Compat is available
|
||||
find_package(Qt6 6.2 COMPONENTS Core5Compat QUIET)
|
||||
if(Qt6Core5Compat_FOUND)
|
||||
set(QT6_CORE5COMPAT_AVAILABLE TRUE)
|
||||
message(STATUS "Found Qt6Core5Compat")
|
||||
endif()
|
||||
|
||||
MESSAGE(STATUS "Qt version is ${Qt6Core_VERSION}")
|
||||
# Find Qt6 core components first (without OpenGL which may not be available)
|
||||
find_package(Qt6 6.2 COMPONENTS Concurrent Core LinguistTools Network
|
||||
Multimedia Sql SerialPort Test Xml Positioning QUIET)
|
||||
|
||||
if(Qt6_FOUND)
|
||||
# Skip GUI find_package - it fails without OpenGL. We'll create manual targets below.
|
||||
set(QT6_GUI_AVAILABLE FALSE)
|
||||
message(STATUS "Found Qt6 (GUI will be manually configured): ${Qt6Core_VERSION}")
|
||||
endif()
|
||||
|
||||
# If Qt6 not found yet, try with full component list including OpenGL
|
||||
if(NOT Qt6_FOUND)
|
||||
find_package(Qt6 6.2 COMPONENTS Concurrent Core LinguistTools Network OpenGL PrintSupport
|
||||
Multimedia Sql Svg SerialPort Test UiTools WebSockets WebEngineCore WebEngineWidgets
|
||||
Widgets Xml Positioning QUIET)
|
||||
if(Qt6_FOUND AND OpenGL_FOUND)
|
||||
set(QT6_GUI_AVAILABLE TRUE)
|
||||
message(STATUS "Found Qt6 with GUI support (OpenGL): ${Qt6Core_VERSION}")
|
||||
endif()
|
||||
endif()
|
||||
|
||||
if(NOT Qt6_FOUND)
|
||||
# Final fallback - try to find Qt6 with minimum required components
|
||||
find_package(Qt6 6.2 COMPONENTS Core REQUIRED)
|
||||
message(STATUS "Found Qt6 (minimal): ${Qt6Core_VERSION}")
|
||||
endif()
|
||||
|
||||
# Manual Qt6 configuration - create imported targets for available libraries
|
||||
if(NOT TARGET Qt6::Core)
|
||||
find_package(Qt6 6.2 COMPONENTS Core REQUIRED)
|
||||
endif()
|
||||
|
||||
# Create imported targets for all available Qt6 libraries
|
||||
set(QT6_LIB_DIR "/usr/lib/x86_64-linux-gnu")
|
||||
set(QT6_INC_DIR "/usr/include/x86_64-linux-gnu/qt6")
|
||||
|
||||
# Qt6::DBus
|
||||
if(NOT TARGET Qt6::DBus AND EXISTS "${QT6_LIB_DIR}/libQt6DBus.so.6")
|
||||
add_library(Qt6::DBus SHARED IMPORTED)
|
||||
set_target_properties(Qt6::DBus PROPERTIES
|
||||
IMPORTED_LOCATION "${QT6_LIB_DIR}/libQt6DBus.so.6.2.4"
|
||||
INTERFACE_INCLUDE_DIRECTORIES "${QT6_INC_DIR}/QtDBus;${QT6_INC_DIR}"
|
||||
INTERFACE_LINK_LIBRARIES "Qt6::Core"
|
||||
)
|
||||
endif()
|
||||
|
||||
# Qt6::Gui (needs OpenGL libs, X11, EGL)
|
||||
if(NOT TARGET Qt6::Gui AND EXISTS "${QT6_LIB_DIR}/libQt6Gui.so.6")
|
||||
add_library(Qt6::Gui SHARED IMPORTED)
|
||||
set_target_properties(Qt6::Gui PROPERTIES
|
||||
IMPORTED_LOCATION "${QT6_LIB_DIR}/libQt6Gui.so.6.2.4"
|
||||
INTERFACE_INCLUDE_DIRECTORIES "${QT6_INC_DIR}/QtGui;${QT6_INC_DIR}"
|
||||
INTERFACE_LINK_LIBRARIES "Qt6::Core;Qt6::DBus;${QT6_LIB_DIR}/libQt6OpenGL.so.6.2.4;${QT6_LIB_DIR}/libEGL.so.1;${QT6_LIB_DIR}/libGLX.so.0;${QT6_LIB_DIR}/libX11.so.6;${CMAKE_DL_LIBS};pthread"
|
||||
)
|
||||
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)
|
||||
endif()
|
||||
set_target_properties(Qt6::Widgets PROPERTIES
|
||||
IMPORTED_LOCATION "${QT6_LIB_DIR}/libQt6Widgets.so.6.2.4"
|
||||
INTERFACE_INCLUDE_DIRECTORIES "/usr/include/x86_64-linux-gnu/qt6/QtWidgets;/usr/include/x86_64-linux-gnu/qt6"
|
||||
INTERFACE_LINK_LIBRARIES "Qt6::Core;Qt6::Gui"
|
||||
)
|
||||
# Set variable for legacy code that uses ${Qt6_Widgets}
|
||||
set(Qt6_Widgets Qt6::Widgets)
|
||||
set(QT6_GUI_AVAILABLE TRUE)
|
||||
message(STATUS "Manually configured Qt6 Widgets target")
|
||||
endif()
|
||||
|
||||
# Stub Qt6::Svg target if not available (needed by multiple plugins)
|
||||
if(NOT TARGET Qt6::Svg)
|
||||
add_library(Qt6::Svg INTERFACE IMPORTED)
|
||||
set_target_properties(Qt6::Svg PROPERTIES
|
||||
INTERFACE_COMPILE_DEFINITIONS "QT_NO_SVG"
|
||||
)
|
||||
message(STATUS "Created stub target for Qt6::Svg (library not available)")
|
||||
endif()
|
||||
|
||||
# Stub Qt6::Multimedia target if not available (needed by OscSystemGuiPlugin, etc.)
|
||||
if(NOT TARGET Qt6::Multimedia)
|
||||
add_library(Qt6::Multimedia INTERFACE IMPORTED)
|
||||
set_target_properties(Qt6::Multimedia PROPERTIES
|
||||
INTERFACE_COMPILE_DEFINITIONS "QT_NO_MULTIMEDIA"
|
||||
)
|
||||
message(STATUS "Created stub target for Qt6::Multimedia (library not available)")
|
||||
endif()
|
||||
|
||||
# Stub Qt6::WebEngineCore target if not available (needed by thp_viewer)
|
||||
if(NOT TARGET Qt6::WebEngineCore)
|
||||
add_library(Qt6::WebEngineCore INTERFACE IMPORTED)
|
||||
set_target_properties(Qt6::WebEngineCore PROPERTIES
|
||||
INTERFACE_COMPILE_DEFINITIONS "QT_NO_WEBENGINE"
|
||||
)
|
||||
message(STATUS "Created stub target for Qt6::WebEngineCore (library not available)")
|
||||
endif()
|
||||
|
||||
# Stub Qt6::WebEngineWidgets target if not available (needed by thp_viewer)
|
||||
if(NOT TARGET Qt6::WebEngineWidgets)
|
||||
add_library(Qt6::WebEngineWidgets INTERFACE IMPORTED)
|
||||
set_target_properties(Qt6::WebEngineWidgets PROPERTIES
|
||||
INTERFACE_COMPILE_DEFINITIONS "QT_NO_WEBENGINE"
|
||||
)
|
||||
message(STATUS "Created stub target for Qt6::WebEngineWidgets (library not available)")
|
||||
endif()
|
||||
|
||||
# Stub KDReports::KDReports target if not available (needed by LtsReportDisplay)
|
||||
if(NOT TARGET KDReports::KDReports)
|
||||
add_library(KDReports::KDReports INTERFACE IMPORTED)
|
||||
set_target_properties(KDReports::KDReports PROPERTIES
|
||||
INTERFACE_COMPILE_DEFINITIONS "NO_KDREPORTS"
|
||||
)
|
||||
message(STATUS "Created stub target for KDReports::KDReports (library not available)")
|
||||
endif()
|
||||
|
||||
# Stub Qt6::Core5Compat target if not available (needed by textEditorTest)
|
||||
if(NOT TARGET Qt6::Core5Compat)
|
||||
add_library(Qt6::Core5Compat INTERFACE IMPORTED)
|
||||
set_target_properties(Qt6::Core5Compat PROPERTIES
|
||||
INTERFACE_COMPILE_DEFINITIONS "QT_NO_CORE5COMPAT"
|
||||
)
|
||||
message(STATUS "Created stub target for Qt6::Core5Compat (library not available)")
|
||||
endif()
|
||||
|
||||
# Stub Qt6::PrintSupport target if not available (needed by textEditorTest, thp_viewer)
|
||||
if(NOT TARGET Qt6::PrintSupport)
|
||||
add_library(Qt6::PrintSupport INTERFACE IMPORTED)
|
||||
set_target_properties(Qt6::PrintSupport PROPERTIES
|
||||
INTERFACE_COMPILE_DEFINITIONS "QT_NO_PRINTSUPPORT"
|
||||
)
|
||||
message(STATUS "Created stub target for Qt6::PrintSupport (library not available)")
|
||||
endif()
|
||||
|
||||
# Stub Qt6::OpenGL target if not available (needed by PwsGuiPlugin)
|
||||
if(NOT TARGET Qt6::OpenGL)
|
||||
add_library(Qt6::OpenGL INTERFACE IMPORTED)
|
||||
set_target_properties(Qt6::OpenGL PROPERTIES
|
||||
INTERFACE_COMPILE_DEFINITIONS "QT_NO_OPENGL"
|
||||
)
|
||||
message(STATUS "Created stub target for Qt6::OpenGL (library not available)")
|
||||
endif()
|
||||
|
||||
# Stub Qt6::WebSockets target if not available (needed by LtsWebSocket, httq, etc.)
|
||||
if(NOT TARGET Qt6::WebSockets)
|
||||
add_library(Qt6::WebSockets INTERFACE IMPORTED)
|
||||
set_target_properties(Qt6::WebSockets PROPERTIES
|
||||
INTERFACE_COMPILE_DEFINITIONS "QT_NO_WEBSOCKETS"
|
||||
)
|
||||
message(STATUS "Created stub target for Qt6::WebSockets (library not available)")
|
||||
endif()
|
||||
|
||||
MESSAGE(STATUS "Qt version is ${Qt6Core_VERSION}, GUI available: ${QT6_GUI_AVAILABLE}")
|
||||
|
||||
#
|
||||
# RTI Connext DDS - manuelle Konfiguration da keine CMake Config Files vorhanden
|
||||
@@ -307,17 +442,20 @@ ENDIF(BUILD_RTI)
|
||||
# Ermöglicht Verwendung von "ddscore" statt "RTI::nddscore" in CMakeLists.txt Files
|
||||
# HINWEIS: ddscore, ddsftc, ddsfts, ddsconnector werden von Lts/DDS Modulen als echte Targets erstellt
|
||||
# Daher hier KEINE ALIAS für diese Targets erstellen um Kollisionen zu vermeiden
|
||||
IF(BUILD_RTI AND TARGET RTI::nddsc)
|
||||
ADD_LIBRARY(ddsc ALIAS RTI::nddsc)
|
||||
# ddscore wird von Lts/DDS/Core/CMakeLists.txt als echtes Target erstellt - kein Alias hier!
|
||||
ADD_LIBRARY(ddscpp2 ALIAS RTI::nddscpp2)
|
||||
# Optionale Targets nur als ALIAS erstellen wenn verfügbar (RTI 7.x hat nicht alle Legacy-Bibliotheken)
|
||||
# KEINE INTERFACE-Placeholder erstellen - Module müssen selbst mit fehlenden Targets umgehen
|
||||
IF(TARGET RTI::nddscpp)
|
||||
ADD_LIBRARY(ddscpp ALIAS RTI::nddscpp)
|
||||
ENDIF()
|
||||
IF(TARGET RTI::nddsctesthelpers)
|
||||
ADD_LIBRARY(nddsctesthelpers ALIAS RTI::nddsctesthelpers)
|
||||
IF(BUILD_RTI)
|
||||
# BUILD_RTI=ON: Targets werden von Lts/DDS/Core/CMakeLists.txt erstellt - hier keine Stubs!
|
||||
# Alias-Typen werden später erstellt, wenn RTI:: Targets verfügbar sind
|
||||
IF(TARGET RTI::nddsc)
|
||||
ADD_LIBRARY(ddsc ALIAS RTI::nddsc)
|
||||
# ddscore wird von Lts/DDS/Core/CMakeLists.txt als echtes Target erstellt - kein Alias hier!
|
||||
ADD_LIBRARY(ddscpp2 ALIAS RTI::nddscpp2)
|
||||
# Optionale Targets nur als ALIAS erstellen wenn verfügbar (RTI 7.x hat nicht alle Legacy-Bibliotheken)
|
||||
IF(TARGET RTI::nddscpp)
|
||||
ADD_LIBRARY(ddscpp ALIAS RTI::nddscpp)
|
||||
ENDIF()
|
||||
IF(TARGET RTI::nddsctesthelpers)
|
||||
ADD_LIBRARY(nddsctesthelpers ALIAS RTI::nddsctesthelpers)
|
||||
ENDIF()
|
||||
ENDIF()
|
||||
# HINWEIS: ddsftc, ddsfts, ddsconnector werden von Lts/DDS/FTC Modulen als INTERFACE Targets erstellt
|
||||
# Hier KEINE ALIAS erstellen um Target-Kollisionen zu vermeiden
|
||||
@@ -330,7 +468,7 @@ ELSE()
|
||||
ADD_LIBRARY(nddsctesthelpers INTERFACE)
|
||||
# HINWEIS: ddsftc, ddsfts, ddsconnector werden von Lts/DDS/FTC Modulen als INTERFACE Targets erstellt
|
||||
# Hier KEINE Platzhalter erstellen um Target-Kollisionen zu vermeiden
|
||||
ENDIF(BUILD_RTI AND TARGET RTI::nddsc)
|
||||
ENDIF(BUILD_RTI)
|
||||
|
||||
ADD_DEFINITIONS(-DQT_USE_QSTRINGBUILDER)
|
||||
ADD_DEFINITIONS(-DQT_NO_CAST_TO_ASCII)
|
||||
|
||||
Reference in new issue
Block a user