Adds modules ./Z and ./Lts/Proxies production ready
This commit is contained in:
5 files changed
+669
-82
No files matched your search
@@ -256,7 +256,7 @@ endif()
|
||||
|
||||
# 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 Svg WebSockets QUIET)
|
||||
Multimedia Sql SerialPort Test Xml Positioning Svg WebSockets PrintSupport OpenGL QUIET)
|
||||
|
||||
if(Qt6_FOUND)
|
||||
# Skip GUI find_package - it fails without OpenGL. We'll create manual targets below.
|
||||
@@ -287,8 +287,18 @@ if(NOT TARGET Qt6::Core)
|
||||
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")
|
||||
# Use Qt6 installation path from find_package or fall back to system paths
|
||||
if(Qt6Core_DIR)
|
||||
get_filename_component(QT6_ROOT_DIR "${Qt6Core_DIR}/../../.." ABSOLUTE)
|
||||
set(QT6_LIB_DIR "${QT6_ROOT_DIR}/lib")
|
||||
set(QT6_INC_DIR "${QT6_ROOT_DIR}/include")
|
||||
elseif(DEFINED ENV{QT_BASE_DIR} AND DEFINED ENV{QT_VERSION} AND DEFINED ENV{QT_ARCH_DIR})
|
||||
set(QT6_LIB_DIR "$ENV{QT_BASE_DIR}/$ENV{QT_VERSION}/$ENV{QT_ARCH_DIR}/lib")
|
||||
set(QT6_INC_DIR "$ENV{QT_BASE_DIR}/$ENV{QT_VERSION}/$ENV{QT_ARCH_DIR}/include")
|
||||
else()
|
||||
set(QT6_LIB_DIR "/usr/lib/x86_64-linux-gnu")
|
||||
set(QT6_INC_DIR "/usr/include/x86_64-linux-gnu/qt6")
|
||||
endif()
|
||||
|
||||
# Qt6::DBus
|
||||
if(NOT TARGET Qt6::DBus AND EXISTS "${QT6_LIB_DIR}/libQt6DBus.so.6")
|
||||
@@ -370,93 +380,70 @@ if(NOT TARGET Qt6::Test AND EXISTS "${QT6_LIB_DIR}/libQt6Test.so.6")
|
||||
message(STATUS "Manually configured Qt6 Test target")
|
||||
endif()
|
||||
|
||||
# Qt6::Svg target should be found by find_package above
|
||||
|
||||
# Stub Qt6::Multimedia target if not available (needed by OscSystemGuiPlugin, etc.)
|
||||
if(NOT TARGET Qt6::Multimedia)
|
||||
add_library(Qt6::Multimedia INTERFACE IMPORTED)
|
||||
# Qt6::Multimedia - create manual target if not found
|
||||
if(NOT TARGET Qt6::Multimedia AND EXISTS "${QT6_LIB_DIR}/libQt6Multimedia.so.6")
|
||||
add_library(Qt6::Multimedia SHARED IMPORTED)
|
||||
set_target_properties(Qt6::Multimedia PROPERTIES
|
||||
INTERFACE_COMPILE_DEFINITIONS "QT_NO_MULTIMEDIA"
|
||||
IMPORTED_LOCATION "${QT6_LIB_DIR}/libQt6Multimedia.so.6"
|
||||
INTERFACE_INCLUDE_DIRECTORIES "${QT6_INC_DIR}/QtMultimedia;${QT6_INC_DIR}"
|
||||
INTERFACE_LINK_LIBRARIES "Qt6::Core;Qt6::Gui"
|
||||
)
|
||||
message(STATUS "Created stub target for Qt6::Multimedia (library not available)")
|
||||
message(STATUS "Manually configured Qt6 Multimedia target")
|
||||
endif()
|
||||
|
||||
# Stub Qt6::Svg target if not available (needed by various plugins)
|
||||
if(NOT TARGET Qt6::Svg)
|
||||
add_library(Qt6::Svg INTERFACE IMPORTED)
|
||||
message(STATUS "Created stub target for Qt6::Svg (library not available)")
|
||||
# Qt6::Svg - create manual target if not found
|
||||
if(NOT TARGET Qt6::Svg AND EXISTS "${QT6_LIB_DIR}/libQt6Svg.so.6")
|
||||
add_library(Qt6::Svg SHARED IMPORTED)
|
||||
set_target_properties(Qt6::Svg PROPERTIES
|
||||
IMPORTED_LOCATION "${QT6_LIB_DIR}/libQt6Svg.so.6"
|
||||
INTERFACE_INCLUDE_DIRECTORIES "${QT6_INC_DIR}/QtSvg;${QT6_INC_DIR}"
|
||||
INTERFACE_LINK_LIBRARIES "Qt6::Core;Qt6::Gui"
|
||||
)
|
||||
message(STATUS "Manually configured Qt6 Svg target")
|
||||
endif()
|
||||
|
||||
# Stub Qt6::SerialPort target if not available (needed by TrainingAreaBaseOC)
|
||||
if(NOT TARGET Qt6::SerialPort)
|
||||
add_library(Qt6::SerialPort INTERFACE IMPORTED)
|
||||
# Qt6::SerialPort - create manual target if not found
|
||||
if(NOT TARGET Qt6::SerialPort AND EXISTS "${QT6_LIB_DIR}/libQt6SerialPort.so.6")
|
||||
add_library(Qt6::SerialPort SHARED IMPORTED)
|
||||
set_target_properties(Qt6::SerialPort PROPERTIES
|
||||
INTERFACE_COMPILE_DEFINITIONS "QT_NO_SERIALPORT"
|
||||
IMPORTED_LOCATION "${QT6_LIB_DIR}/libQt6SerialPort.so.6"
|
||||
INTERFACE_INCLUDE_DIRECTORIES "${QT6_INC_DIR}/QtSerialPort;${QT6_INC_DIR}"
|
||||
INTERFACE_LINK_LIBRARIES "Qt6::Core"
|
||||
)
|
||||
message(STATUS "Created stub target for Qt6::SerialPort (library not available)")
|
||||
message(STATUS "Manually configured Qt6 SerialPort target")
|
||||
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)
|
||||
# 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
|
||||
INTERFACE_COMPILE_DEFINITIONS "QT_NO_WEBSOCKETS"
|
||||
IMPORTED_LOCATION "${QT6_LIB_DIR}/libQt6WebSockets.so.6"
|
||||
INTERFACE_INCLUDE_DIRECTORIES "${QT6_INC_DIR}/QtWebSockets;${QT6_INC_DIR}"
|
||||
INTERFACE_LINK_LIBRARIES "Qt6::Core;Qt6::Network"
|
||||
)
|
||||
message(STATUS "Created stub target for Qt6::WebSockets (library not available)")
|
||||
message(STATUS "Manually configured Qt6 WebSockets target")
|
||||
endif()
|
||||
|
||||
# Qt6::PrintSupport - create manual target if not found
|
||||
if(NOT TARGET Qt6::PrintSupport AND EXISTS "${QT6_LIB_DIR}/libQt6PrintSupport.so.6")
|
||||
add_library(Qt6::PrintSupport SHARED IMPORTED)
|
||||
set_target_properties(Qt6::PrintSupport PROPERTIES
|
||||
IMPORTED_LOCATION "${QT6_LIB_DIR}/libQt6PrintSupport.so.6"
|
||||
INTERFACE_INCLUDE_DIRECTORIES "${QT6_INC_DIR}/QtPrintSupport;${QT6_INC_DIR}"
|
||||
INTERFACE_LINK_LIBRARIES "Qt6::Core;Qt6::Gui;Qt6::Widgets"
|
||||
)
|
||||
message(STATUS "Manually configured Qt6 PrintSupport target")
|
||||
endif()
|
||||
|
||||
# Qt6::OpenGL - create manual target if not found
|
||||
if(NOT TARGET Qt6::OpenGL AND EXISTS "${QT6_LIB_DIR}/libQt6OpenGL.so.6")
|
||||
add_library(Qt6::OpenGL SHARED IMPORTED)
|
||||
set_target_properties(Qt6::OpenGL PROPERTIES
|
||||
IMPORTED_LOCATION "${QT6_LIB_DIR}/libQt6OpenGL.so.6"
|
||||
INTERFACE_INCLUDE_DIRECTORIES "${QT6_INC_DIR}/QtOpenGL;${QT6_INC_DIR}"
|
||||
INTERFACE_LINK_LIBRARIES "Qt6::Core;Qt6::Gui"
|
||||
)
|
||||
message(STATUS "Manually configured Qt6 OpenGL target")
|
||||
endif()
|
||||
|
||||
MESSAGE(STATUS "Qt version is ${Qt6Core_VERSION}, GUI available: ${QT6_GUI_AVAILABLE}")
|
||||
|
||||
Reference in new issue
Block a user