lifemaps/qt-migration-legatus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adds latest migration results

Browse Source
This commit is contained in:
torsten committed 2026-09-01 12:27:57 +02:00
1 parent ad07345480
commit 0c1503d85c
829 files changed
+32327 -68139
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/CMakeLists.txt
+174 -36
View File
@@ -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,18 +442,21 @@ 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)
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)
# 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)
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
ELSE()
@@ -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)
qt6-after/qt6-migrated-legatus/Lts/Application/AarApp/CMakeLists.txt
+13 -3
View File
@@ -5,6 +5,14 @@
# Created by Hanna Rathje, SLSE, 2017-12-14
#
# Make ${Qt6_Widgets} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
set(Qt6_Widgets ${Qt6_Widgets})
else()
set(Qt6_Widgets "")
endif()
SET(SRCS
aar_application.cpp
aar_application.h
@@ -19,8 +27,9 @@ NGL_WRAP_UI(SRCS aarApp.ui)
NGL_ADD_EXECUTABLE(AAR aarApp ${SRCS})
NGL_TARGET_LINK_LIBRARIES(aarApp
Qt6::Widgets
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(aarApp
${Qt6_Widgets}
Qt6::Core
nglapplication
ngldb
@@ -30,7 +39,8 @@ NGL_TARGET_LINK_LIBRARIES(aarApp
nglwidgets
NGLLogger
LtsCommandLineParser
)
)
endif()
NGL_INSTALL_TARGET(aarApp)
NGL_INSTALL(AAR FILES log4cxx_aarApp.props DESTINATION bin)
qt6-after/qt6-migrated-legatus/Lts/Application/OpApp/CMakeLists.txt
+13 -3
View File
@@ -4,6 +4,14 @@
# $Author$
#
# Make ${Qt6_Widgets} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
set(Qt6_Widgets ${Qt6_Widgets})
else()
set(Qt6_Widgets "")
endif()
SET(LOG4CXX_PROPS_FILE log4cxx_opapp.props)
SET(mwt_SRCS
@@ -28,9 +36,10 @@ ELSE()
NGL_ADD_EXECUTABLE(WS OperatorApplication ${mwt_SRCS})
ENDIF()
NGL_TARGET_LINK_LIBRARIES(OperatorApplication
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(OperatorApplication
ArcGISQt5Hack # make sure it's loaded *before* libEsriCommonQt.so
Qt6::Widgets
${Qt6_Widgets}
Qt6::Network
nglapplication
LtsCommandLineParser
@@ -47,7 +56,8 @@ NGL_TARGET_LINK_LIBRARIES(OperatorApplication
LtsMultiMonitor # TODO: rm if -m is out
LtsUtilsGuiConnectDialog # to set timeout if -v is set
LtsUtilsGuiStyleManager
)
)
endif()
NGL_INSTALL_TARGET(OperatorApplication)
NGL_INSTALL(FILES WS ${LOG4CXX_PROPS_FILE} DESTINATION "bin")
qt6-after/qt6-migrated-legatus/Lts/Application/THP/CMakeLists.txt
+21 -4
View File
@@ -1,6 +1,21 @@
#
# THP-Viewer
#
# Make ${Qt6_Gui} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Gui)
set(Qt6_Gui ${Qt6_Gui})
else()
set(Qt6_Gui "")
endif()
# Make ${Qt6_Widgets} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
set(Qt6_Widgets ${Qt6_Widgets})
else()
set(Qt6_Widgets "")
endif()
ADD_SUBDIRECTORY(THP-Starter)
# Make VLC optional - only try to find it if user explicitly enables it
@@ -91,16 +106,17 @@ NGL_TARGET_COMPILE_DEFINITIONS(thp_viewer
PRIVATE
)
ENDIF()
NGL_TARGET_LINK_LIBRARIES(thp_viewer
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(thp_viewer
ArcGISQt5Hack # make sure it's loaded *before* libEsriCommonQt.so
Qt6::Core
Qt6::Gui
${Qt6_Gui}
Qt6::PrintSupport
Qt6::Svg
Qt6::WebEngineCore
Qt6::WebEngineWidgets
Qt6::Widgets
${Qt6_Widgets}
Qt6::Xml
RmeLightStyleQrc
@@ -135,7 +151,8 @@ NGL_TARGET_LINK_LIBRARIES(thp_viewer
svcPpmClient
svcPdmClient
svcAlmClient
)
)
endif()
IF(VLC_FOUND)
NGL_TARGET_LINK_LIBRARIES(thp_viewer
$<$<TARGET_EXISTS:PkgConfig::VLC>:PkgConfig::VLC>
qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/CMakeLists.txt
+11 -1
View File
@@ -4,6 +4,14 @@
# $Author$
#
# Make ${Qt6_Widgets} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
set(Qt6_Widgets ${Qt6_Widgets})
else()
set(Qt6_Widgets "")
endif()
FIND_PACKAGE(RTI)
# Grantlee5 is Qt5-based and optional for Qt6 migration
@@ -148,13 +156,15 @@ IF(BUILD_GRANTLEE AND TARGET Grantlee5::Templates)
main_grantlee_gui.cpp
main_grantlee_gui.ui
)
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(codegen_gui
codegen_grantlee
LtsCommandLineParser
nglapplication
Qt6::Widgets
${Qt6_Widgets}
Grantlee5::Templates
)
endif()
ELSE()
message(STATUS "BUILD_GRANTLEE disabled or Grantlee not found; skipping codegen_grantlee, ngl_codegen, and codegen_gui targets")
ENDIF()
qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/StructBuilder.cpp
+4 -4
View File
@@ -1339,16 +1339,16 @@ StructBuilder::ServiceTypeStruct StructBuilder::extractServiceAndTypeFromTypenam
if (!extServiceRef.isEmpty())
{
if (extServiceRef.contains(QLatin1Char('<')))
ret.service = QString(extServiceRef).split(QLatin1Char('<')).at(1);
ret.service = extServiceRef.toString().split(QLatin1Char('<')).at(1);
else
ret.service = QString(extServiceRef);
ret.service = extServiceRef.toString();
}
if (!extTypeRef.isEmpty())
{
if (extTypeRef.contains(QLatin1Char('>')))
ret.type = QString(extTypeRef).split(QLatin1Char('>')).at(0);
ret.type = extTypeRef.toString().split(QLatin1Char('>')).at(0);
else
ret.type = QString(extTypeRef);
ret.type = extTypeRef.toString();
}
return ret;
}
qt6-after/qt6-migrated-legatus/Lts/Common/LtsAppDescriptor/CMakeLists.txt
+16 -6
View File
@@ -8,6 +8,14 @@
# LtsAppDescriptor (lib)
# Make ${Qt6_Widgets} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
set(Qt6_Widgets ${Qt6_Widgets})
else()
set(Qt6_Widgets "")
endif()
SET(LtsAppDescriptor_SRCS
lts_app_descriptor.cpp
lts_app_descriptor.h
@@ -64,12 +72,14 @@ NGL_TARGET_LINK_LIBRARIES(LtsAppDescriptorChecker
# ${CMAKE_CURRENT_SOURCE_DIR}/../
#)
#NGL_TARGET_LINK_LIBRARIES(LtsAppDescriptorEditor
# PUBLIC
# Qt6::Core
# Qt6::Widgets
# LtsAppDescriptor
#)
if(QT6_GUI_AVAILABLE)
#NGL_TARGET_LINK_LIBRARIES(LtsAppDescriptorEditor
# PUBLIC
# Qt6::Core
# ${Qt6_Widgets}
# LtsAppDescriptor
#)
endif()
#NGL_INSTALL_TARGET(LtsAppDescriptorEditor) #not visible for end-user
qt6-after/qt6-migrated-legatus/Lts/Common/LtsAppManager/CMakeLists.txt
+22 -5
View File
@@ -1,4 +1,19 @@
#
# Make ${Qt6_Gui} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Gui)
set(Qt6_Gui ${Qt6_Gui})
else()
set(Qt6_Gui "")
endif()
# Make ${Qt6_Widgets} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
set(Qt6_Widgets ${Qt6_Widgets})
else()
set(Qt6_Widgets "")
endif()
#
# $Id$
# $HeadURL$
# $Author$
@@ -28,7 +43,8 @@ NGL_TARGET_INCLUDE_DIRECTORIES(LtsAppManager
${CMAKE_CURRENT_SOURCE_DIR}/AppChooser/
)
NGL_TARGET_LINK_LIBRARIES(LtsAppManager
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(LtsAppManager
PRIVATE
NGLLogger
LtsDataView
@@ -40,15 +56,16 @@ NGL_TARGET_LINK_LIBRARIES(LtsAppManager
LtsUtilsSettings
LtsMultiMonitor
ProjectConfig
Qt6::Gui
Qt6::Widgets
${Qt6_Gui}
${Qt6_Widgets}
Qt6::Network # debug server
OpmSettingsGuiPluginInterface
LtsPluginLoader
PUBLIC
Qt6::Core
LtsAppDescriptor
)
)
endif()
NGL_INSTALL_TARGET(LtsAppManager)
ENDIF(BUILD_RTI)
qt6-after/qt6-migrated-legatus/Lts/Common/LtsCoordTrans/CMakeLists.txt
+13 -3
View File
@@ -5,6 +5,14 @@
# Created by Christian Ehrlicher, SLSE, 2016-08-31
#
# Make ${Qt6_Widgets} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
set(Qt6_Widgets ${Qt6_Widgets})
else()
set(Qt6_Widgets "")
endif()
FIND_PACKAGE(GeographicLib)
NGL_ADD_LIBRARY2(LtsCoordTrans WS AAR SV HLA SHARED
lts_coord_trans.h
@@ -38,13 +46,15 @@ NGL_WRAP_UI(ltsCoordWidget_SRCS
lts_coord_widget_wgs84.ui
)
NGL_ADD_LIBRARY2(ltsCoordWidget WS AAR SV SHARED ${ltsCoordWidget_SRCS})
NGL_TARGET_LINK_LIBRARIES(ltsCoordWidget
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(ltsCoordWidget
PRIVATE
LtsCoordTrans
PUBLIC
Qt6::Core
Qt6::Widgets
)
${Qt6_Widgets}
)
endif()
NGL_TARGET_INCLUDE_DIRECTORIES(ltsCoordWidget
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../
qt6-after/qt6-migrated-legatus/Lts/Common/LtsCoordinate/UnitTest_Coordinate/CMakeLists.txt
+9 -1
View File
@@ -5,6 +5,14 @@
# $Author$
#
# Make ${Qt6_Gui} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Gui)
set(Qt6_Gui ${Qt6_Gui})
else()
set(Qt6_Gui "")
endif()
SET(UnitTestSources
lts_coordinate_unit_test.cpp
lts_coordinate_unit_test.h
@@ -22,7 +30,7 @@ TARGET_LINK_LIBRARIES(commonUnitTestCoordinate
situationMapCommon
situationMapElevationMap
Qt6::Core
Qt6::Gui
${Qt6_Gui}
Qt6::Test)
ADD_TEST(NAME commonUnitTestCoordinate COMMAND $<TARGET_FILE:commonUnitTestCoordinate>)
qt6-after/qt6-migrated-legatus/Lts/Common/LtsElevation/CMakeLists.txt
+17 -7
View File
@@ -4,6 +4,14 @@
# $Author$
#
# Make ${Qt6_Gui} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Gui)
set(Qt6_Gui ${Qt6_Gui})
else()
set(Qt6_Gui "")
endif()
NGL_ADD_LIBRARY2(WS SV HLA LtsElevation SHARED
lts_elevation_manager.cpp
lts_elevation_manager.h
@@ -18,18 +26,20 @@ NGL_TARGET_INCLUDE_DIRECTORIES(LtsElevation
${CMAKE_SOURCE_DIR}/Lts/Viewer/SituationMap
${CMAKE_SOURCE_DIR}/Lts/Viewer/SituationMap/Common
)
NGL_TARGET_LINK_LIBRARIES(LtsElevation
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(LtsElevation
PRIVATE
NGLLogger
## LtsSessionDataDds
## ExmDataPluginInterface # External dependency - missing
## situationMapCommon # External dependency - missing
## situationMapElevationMap # External dependency - missing
## LtsSessionDataDds
## ExmDataPluginInterface # External dependency - missing
## situationMapCommon # External dependency - missing
## situationMapElevationMap # External dependency - missing
PUBLIC
LtsUtilsCoreHeaderOnly
Qt6::Core
Qt6::Gui
)
${Qt6_Gui}
)
endif()
if(BUILD_RTI)
target_link_libraries(LtsElevation PRIVATE AsmDataPluginInterface)
qt6-after/qt6-migrated-legatus/Lts/Common/LtsElevation/UnitTest_Elevation/CMakeLists.txt
+9 -1
View File
@@ -1,3 +1,11 @@
# Make ${Qt6_Gui} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Gui)
set(Qt6_Gui ${Qt6_Gui})
else()
set(Qt6_Gui "")
endif()
#
# @RDE_HEADER@
# $Id$
@@ -18,7 +26,7 @@
# situationMapCommon
# situationMapElevationMap
# Qt6::Core
# Qt6::Gui
# ${Qt6_Gui}
# Qt6::Test)
#
# ADD_TEST(NAME commenUnitTestElevation COMMAND $<TARGET_FILE:commenUnitTestElevation>)
qt6-after/qt6-migrated-legatus/Lts/Common/LtsLicence/CMakeLists.txt
+12 -8
View File
@@ -5,7 +5,7 @@
# Created by hjl, SLSE, 2016-05-31
#
FIND_PACKAGE(OpenSSL REQUIRED)
FIND_PACKAGE(OpenSSL)
SET(ltslicence_SRCS
aes_crypt.cpp
@@ -14,22 +14,23 @@ SET(ltslicence_SRCS
lts_licence.h
)
NGL_ADD_LIBRARY2(AAR SV WS LtsLicence SHARED ${ltslicence_SRCS})
if(OPENSSL_FOUND)
NGL_ADD_LIBRARY2(AAR SV WS LtsLicence SHARED ${ltslicence_SRCS})
NGL_TARGET_INCLUDE_DIRECTORIES(LtsLicence
NGL_TARGET_INCLUDE_DIRECTORIES(LtsLicence
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../
)
NGL_TARGET_LINK_LIBRARIES(LtsLicence
)
NGL_TARGET_LINK_LIBRARIES(LtsLicence
PRIVATE
${OPENSSL_LIBRARIES}
Qt6::Xml
NGLLogger
PUBLIC
Qt6::Core
)
)
IF (BUILD_TESTING AND TARGET LtsLicence)
IF (BUILD_TESTING AND TARGET LtsLicence)
ADD_EXECUTABLE(aes_crypt_test aes_crypt_test.cpp aes_crypt_test.h)
TARGET_LINK_LIBRARIES(aes_crypt_test
LtsLicence
@@ -38,4 +39,7 @@ IF (BUILD_TESTING AND TARGET LtsLicence)
Qt6::Test
)
ADD_TEST(NAME aes_crypt_test COMMAND $<TARGET_FILE:aes_crypt_test>)
ENDIF()
ENDIF()
else()
message(WARNING "LtsLicence skipped: OpenSSL not found")
endif()
qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/CMakeLists.txt
+21 -4
View File
@@ -8,6 +8,21 @@
# LtsMultiMonitor
# Make ${Qt6_Gui} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Gui)
set(Qt6_Gui ${Qt6_Gui})
else()
set(Qt6_Gui "")
endif()
# Make ${Qt6_Widgets} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
set(Qt6_Widgets ${Qt6_Widgets})
else()
set(Qt6_Widgets "")
endif()
SET(LtsMultiMonitor_SRCS
lts_multi_monitor_export.h
lts_multi_monitor.cpp
@@ -36,16 +51,18 @@ NGL_TARGET_INCLUDE_DIRECTORIES(LtsMultiMonitor
${CMAKE_SOURCE_DIR}/Lts/Common/LtsUtils
)
NGL_TARGET_LINK_LIBRARIES(LtsMultiMonitor
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(LtsMultiMonitor
PUBLIC
Qt6::Core
Qt6::Widgets
${Qt6_Widgets}
PRIVATE
Qt6::Gui
${Qt6_Gui}
LtsWidgets
LtsSessionData
LtsUtilsCore
LtsUtilsGuiDds
)
)
endif()
NGL_INSTALL_TARGET(LtsMultiMonitor)
qt6-after/qt6-migrated-legatus/Lts/Common/LtsNotification/CMakeLists.txt
+13 -3
View File
@@ -6,6 +6,14 @@
#
# Make ${Qt6_Widgets} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
set(Qt6_Widgets ${Qt6_Widgets})
else()
set(Qt6_Widgets "")
endif()
SET(LtsNoti_SRCS
lts_notification.h
lts_notification.cpp
@@ -21,8 +29,10 @@ NGL_TARGET_INCLUDE_DIRECTORIES(LtsNotification
${CMAKE_CURRENT_BINARY_DIR}/../
)
NGL_TARGET_LINK_LIBRARIES(LtsNotification
Qt6::Widgets
)
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(LtsNotification
${Qt6_Widgets}
)
endif()
NGL_INSTALL_TARGET(LtsNotification)
qt6-after/qt6-migrated-legatus/Lts/Common/LtsPluginManager/CMakeLists.txt
+13 -3
View File
@@ -7,6 +7,14 @@
# LtsPluginLoader
# Make ${Qt6_Widgets} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
set(Qt6_Widgets ${Qt6_Widgets})
else()
set(Qt6_Widgets "")
endif()
NGL_ADD_LIBRARY2(ALL LtsPluginLoader SHARED lts_plugin_loader.cpp lts_plugin_loader.h)
NGL_TARGET_INCLUDE_DIRECTORIES(LtsPluginLoader
PUBLIC
@@ -45,7 +53,8 @@ NGL_TARGET_INCLUDE_DIRECTORIES(LtsPluginManager
${CMAKE_CURRENT_SOURCE_DIR}/../
)
NGL_TARGET_LINK_LIBRARIES(LtsPluginManager
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(LtsPluginManager
PRIVATE
NGLLogger
LtsPluginLoader
@@ -54,12 +63,13 @@ NGL_TARGET_LINK_LIBRARIES(LtsPluginManager
LtsWidgets
LtsSession
LtsSessionData
Qt6::Widgets
${Qt6_Widgets}
PUBLIC
ProjectConfig
LtsAppDescriptor
Qt6::Core
)
)
endif()
NGL_INSTALL_TARGET(LtsPluginManager)
ENDIF(BUILD_RTI)
qt6-after/qt6-migrated-legatus/Lts/Common/LtsPrinting/CMakeLists.txt
+6 -2
View File
@@ -6,7 +6,9 @@
# Created by Christian Ehrlicher, SLSE, 2017-12-05
#
FIND_PACKAGE(KDReports)
if(QT6_GUI_AVAILABLE)
find_package(KDReports QUIET)
endif()
SET(SRCS
printing_base.cpp
@@ -15,12 +17,13 @@ SET(SRCS
printing.h
)
if (KDReports_FOUND AND BUILD_CODIFICATION)
if (KDReports_FOUND AND QT6_GUI_AVAILABLE AND BUILD_CODIFICATION)
NGL_ADD_LIBRARY2(WS LtsPrinting SHARED ${SRCS})
NGL_TARGET_INCLUDE_DIRECTORIES(LtsPrinting
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../
)
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(LtsPrinting
PRIVATE
KDReports::KDReports
@@ -32,6 +35,7 @@ if (KDReports_FOUND AND BUILD_CODIFICATION)
Qt6::PrintSupport
Qt6::Core
)
endif()
NGL_INSTALL_TARGET(LtsPrinting)
else()
message(STATUS "KDReports not found or BUILD_RTI disabled; skipping LtsPrinting target")
qt6-after/qt6-migrated-legatus/Lts/Common/LtsProjectionWorkstation/CMakeLists.txt
+13 -3
View File
@@ -5,6 +5,14 @@
# Created by Christian Roeskens, NLSE, 2018-03-02
# Make ${Qt6_Gui} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Gui)
set(Qt6_Gui ${Qt6_Gui})
else()
set(Qt6_Gui "")
endif()
SET(LtsProjectionWorkstation_SRCS
lts_projection_workstation.h
@@ -32,16 +40,18 @@ NGL_TARGET_INCLUDE_DIRECTORIES(LtsProjectionWorkstation
${CMAKE_CURRENT_SOURCE_DIR}/../
)
NGL_TARGET_LINK_LIBRARIES(LtsProjectionWorkstation
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(LtsProjectionWorkstation
PUBLIC
Qt6::Core
PRIVATE
Qt6::Gui
${Qt6_Gui}
NGLLogger
nglsettings
LtsWebSocketServer
LtsSession
LtsSessionData
)
)
endif()
NGL_INSTALL_TARGET(LtsProjectionWorkstation)
qt6-after/qt6-migrated-legatus/Lts/Common/LtsScriptTimeline/CMakeLists.txt
+13 -3
View File
@@ -12,6 +12,14 @@
# Library
# Make ${Qt6_Widgets} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
set(Qt6_Widgets ${Qt6_Widgets})
else()
set(Qt6_Widgets "")
endif()
SET(LtsScriptTimeline_SRCS
tools.h
tools.cpp
@@ -65,10 +73,12 @@ NGL_TARGET_INCLUDE_DIRECTORIES(LtsScriptTimeline
${CMAKE_CURRENT_SOURCE_DIR}/../
)
NGL_TARGET_LINK_LIBRARIES(LtsScriptTimeline
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(LtsScriptTimeline
Qt6::Core
Qt6::Widgets
${Qt6_Widgets}
LtsWidgets
LtsSessionData
)
)
endif()
ENDIF(BUILD_RTI)
qt6-after/qt6-migrated-legatus/Lts/Common/LtsSerialPortQuerry/CMakeLists.txt
+1 -1
View File
@@ -27,5 +27,5 @@ NGL_TARGET_LINK_LIBRARIES(LtsSerialPortQuerry
PRIVATE
PUBLIC
NGLLogger
Qt6::SerialPort
$<IF:$<TARGET_EXISTS:Qt6::SerialPort>,Qt6::SerialPort,>
)
qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/CMakeLists.txt
+13 -3
View File
@@ -6,6 +6,14 @@
#
# RTI Connext DDS - uses IMPORTED targets from parent CMakeLists.txt
# Make ${Qt6_Gui} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Gui)
set(Qt6_Gui ${Qt6_Gui})
else()
set(Qt6_Gui "")
endif()
OPTION(BUILD_RTI "Build with RTI Connext DDS support" ON)
# Find RTI Connext DDS - manual configuration (no CMake config file available)
@@ -88,7 +96,7 @@ SET(LtsSession_PRIVATE_LIBS
LtsSessionData
LtsUtilsGuiDds # ReqHelpr & for Debug Menu ! TODO: rm on release!
LtsNotification
Qt6::Svg
$<IF:$<TARGET_EXISTS:Qt6::Svg>,Qt6::Svg,>
)
IF(SVCCORECLIENT_LIBRARY)
LIST(APPEND LtsSession_PRIVATE_LIBS ${SVCCORECLIENT_LIBRARY})
@@ -133,11 +141,13 @@ NGL_TARGET_INCLUDE_DIRECTORIES(LtsSessionData
${CMAKE_CURRENT_SOURCE_DIR}/../
)
NGL_TARGET_LINK_LIBRARIES(LtsSessionData
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(LtsSessionData
PUBLIC
Qt6::Core
Qt6::Gui # QPixmap as Storage for Profile Picture
)
)
endif()
IF(BUILD_RTI)
NGL_TARGET_LINK_LIBRARIES(LtsSessionData
PUBLIC
qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimeline/CMakeLists.txt
+27 -8
View File
@@ -8,6 +8,21 @@
# Created by Mike Wille, SLTE, 2021-05-18
#
# Make ${Qt6_Gui} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Gui)
set(Qt6_Gui ${Qt6_Gui})
else()
set(Qt6_Gui "")
endif()
# Make ${Qt6_Widgets} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
set(Qt6_Widgets ${Qt6_Widgets})
else()
set(Qt6_Widgets "")
endif()
SET(src
timeline_model.h
timeline_model.cpp
@@ -51,25 +66,29 @@ NGL_TARGET_INCLUDE_DIRECTORIES(LtsTimeline
${CMAKE_CURRENT_SOURCE_DIR}/../
${CMAKE_CURRENT_BINARY_DIR}
)
NGL_TARGET_LINK_LIBRARIES(LtsTimeline
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(LtsTimeline
PRIVATE
NGLLogger
ngltools # DTG
LtsWidgets # LtsMessageDialogNew for remove filter track
Qt6::Core
Qt6::Gui
Qt6::Widgets
)
${Qt6_Gui}
${Qt6_Widgets}
)
endif()
NGL_INSTALL_TARGET(LtsTimeline)
# LtsTimelineTest
NGL_ADD_EXECUTABLE(WS LtsTimelineTest main.cpp)
NGL_TARGET_LINK_LIBRARIES(LtsTimelineTest
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(LtsTimelineTest
LtsTimeline
nglapplication
NGLLogger
Qt6::Core
Qt6::Gui
Qt6::Widgets
)
${Qt6_Gui}
${Qt6_Widgets}
)
endif()
qt6-after/qt6-migrated-legatus/Lts/Common/LtsTimelineClassic/CMakeLists.txt
+21 -4
View File
@@ -8,6 +8,21 @@
# Created by Mike Wille, SLSE, 2017-02-10
#
# Make ${Qt6_Gui} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Gui)
set(Qt6_Gui ${Qt6_Gui})
else()
set(Qt6_Gui "")
endif()
# Make ${Qt6_Widgets} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
set(Qt6_Widgets ${Qt6_Widgets})
else()
set(Qt6_Widgets "")
endif()
SET(timeline_SRCS
EventDelegate.cpp
EventTools.cpp
@@ -65,15 +80,17 @@ NGL_TARGET_INCLUDE_DIRECTORIES(LtsTimelineClassic
${CMAKE_CURRENT_BINARY_DIR}
)
NGL_TARGET_LINK_LIBRARIES(LtsTimelineClassic
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(LtsTimelineClassic
PRIVATE
NGLLogger
ngltools # DTG
Qt6::Core
Qt6::Gui
Qt6::Widgets
${Qt6_Gui}
${Qt6_Widgets}
LtsSessionDataDds
)
)
endif()
qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsGui/ConnectDialog/CMakeLists.txt
+13 -3
View File
@@ -5,6 +5,14 @@
# Created by Mike Wille, SLSE, 2016-05-12
#
# Make ${Qt6_Widgets} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
set(Qt6_Widgets ${Qt6_Widgets})
else()
set(Qt6_Widgets "")
endif()
SET(srcs
connect_dialog.h
connect_dialog.cpp
@@ -22,7 +30,9 @@ NGL_TARGET_INCLUDE_DIRECTORIES(LtsUtilsGuiConnectDialog
${CMAKE_CURRENT_SOURCE_DIR}/../
${CMAKE_CURRENT_BINARY_DIR}/../
)
NGL_TARGET_LINK_LIBRARIES(LtsUtilsGuiConnectDialog
Qt6::Widgets
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(LtsUtilsGuiConnectDialog
${Qt6_Widgets}
LtsWidgets
)
)
endif()
qt6-after/qt6-migrated-legatus/Lts/Common/LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/CMakeLists.txt
+21 -4
View File
@@ -6,6 +6,21 @@
# Created by Mike Wille, SLSE, 2016-09-19
#
# Make ${Qt6_Gui} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Gui)
set(Qt6_Gui ${Qt6_Gui})
else()
set(Qt6_Gui "")
endif()
# Make ${Qt6_Widgets} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
set(Qt6_Widgets ${Qt6_Widgets})
else()
set(Qt6_Widgets "")
endif()
SET(SRCS
dds_vector_to_pixmap.cpp
dds_vector_to_pixmap.h
@@ -20,14 +35,16 @@ NGL_TARGET_INCLUDE_DIRECTORIES(LtsUtilsGuiDds
${CMAKE_CURRENT_SOURCE_DIR}/../../../
${CMAKE_CURRENT_BINARY_DIR}/../
)
NGL_TARGET_LINK_LIBRARIES(LtsUtilsGuiDds
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(LtsUtilsGuiDds
PUBLIC
LtsUtilsCoreHeaderOnly
LtsWidgets
Qt6::Gui
Qt6::Widgets
${Qt6_Gui}
${Qt6_Widgets}
Qt6::Svg
)
)
endif()
IF(BUILD_RTI)
TARGET_LINK_LIBRARIES(LtsUtilsGuiDds PUBLIC ddscore)
ENDIF(BUILD_RTI)
qt6-after/qt6-migrated-legatus/Lts/Common/LtsVirtualKeyboard/CMakeLists.txt
+21 -4
View File
@@ -8,6 +8,21 @@
# Lts Widgets library
#
# Make ${Qt6_Gui} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Gui)
set(Qt6_Gui ${Qt6_Gui})
else()
set(Qt6_Gui "")
endif()
# Make ${Qt6_Widgets} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
set(Qt6_Widgets ${Qt6_Widgets})
else()
set(Qt6_Widgets "")
endif()
SET(ltsvkeyboard_SRCS
LtsKeyPushButton.h
LtsKeyPushButton.cpp
@@ -26,13 +41,15 @@ NGL_TARGET_INCLUDE_DIRECTORIES(LtsVirtualKeyboard
${CMAKE_CURRENT_SOURCE_DIR}/../
)
NGL_TARGET_LINK_LIBRARIES(LtsVirtualKeyboard
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(LtsVirtualKeyboard
PRIVATE
PUBLIC
LtsWidgets
LtsSession
LtsAppManager
Qt6::Widgets
Qt6::Gui
)
${Qt6_Widgets}
${Qt6_Gui}
)
endif()
ENDIF(BUILD_RTI)
qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/CMakeLists.txt
+9 -1
View File
@@ -7,6 +7,14 @@
#
# --- Library LtsWebSocketCommon --------------------------------------------------------------------------------
#
# Make ${Qt6_WebSockets} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::WebSockets)
set(Qt6_WebSockets ${Qt6_WebSockets})
else()
set(Qt6_WebSockets "")
endif()
SET(LtsWebSocketCommon_SRCS
client_message_factory.cpp
client_message_factory.h
@@ -30,7 +38,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(LtsWebSocketCommon
NGL_TARGET_LINK_LIBRARIES(LtsWebSocketCommon
Qt6::Core
Qt6::WebSockets
${Qt6_WebSockets}
NGLLogger
)
qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/client_connection.cpp
+4
View File
@@ -3,7 +3,9 @@
#include "client_connection.h"
#include "logger.h"
#ifdef QT6_WEBSOCKETS_AVAILABLE
#include <QtWebSockets/QWebSocket>
#endif
namespace LtsWebSocket
{
@@ -20,6 +22,7 @@ ClientConnection::~ClientConnection()
qDeleteAll(m_messageQueue);
}
#ifdef QT6_WEBSOCKETS_AVAILABLE
bool ClientConnection::init()
{
if (m_socket == nullptr)
@@ -81,5 +84,6 @@ void ClientConnection::onSocketDisconnect()
exit(0);
emit disconnected(this);
}
#endif
} // namespace LtsWebSocket
qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/client_connection.h
+28
View File
@@ -9,7 +9,25 @@
#include <QtCore/QQueue>
#include <QtCore/QThread>
#ifdef QT6_WEBSOCKETS_AVAILABLE
class QWebSocket;
#else
namespace LtsWebSocket { class QWebSocketStub; }
using QWebSocket = LtsWebSocket::QWebSocketStub;
namespace LtsWebSocket
{
class QWebSocketStub
{
public:
QWebSocketStub(QObject* parent = nullptr) { Q_UNUSED(parent); }
virtual ~QWebSocketStub() = default;
void sendTextMessage(const QString& /*message*/) {}
void close() {}
bool isValid() const { return false; }
QString errorString() const { return QString(); }
};
} // namespace LtsWebSocket
#endif
namespace LtsWebSocket
{
@@ -22,6 +40,7 @@ class LTSWEBSOCKETSERVER_EXPORT ClientConnection : public QThread, public ReplyH
~ClientConnection();
#ifdef QT6_WEBSOCKETS_AVAILABLE
bool init();
void addReply(ReplyMessage* message) override;
@@ -30,6 +49,11 @@ class LTSWEBSOCKETSERVER_EXPORT ClientConnection : public QThread, public ReplyH
{
return m_socket;
}
#else
bool init() { return false; }
void addReply(ReplyMessage* /*message*/) override {}
QWebSocket* webSocket() { return nullptr; }
#endif
signals:
@@ -38,13 +62,17 @@ class LTSWEBSOCKETSERVER_EXPORT ClientConnection : public QThread, public ReplyH
void disconnected(ClientConnection* client);
private slots:
#ifdef QT6_WEBSOCKETS_AVAILABLE
void onNewTextMessageFromSocket(const QString& message);
void sendMessagesFromQueue();
void onSocketDisconnect();
#endif
private:
NGL::INGLLogger& m_logger;
#ifdef QT6_WEBSOCKETS_AVAILABLE
void sendMessages();
#endif
QWebSocket* m_socket;
QQueue<ReplyMessage*> m_messageQueue;
};
qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/connection_handler.cpp
+6
View File
@@ -5,8 +5,10 @@
#include "client_connection.h"
#include "logger.h"
#ifdef QT6_WEBSOCKETS_AVAILABLE
#include <QtWebSockets/QWebSocket>
#include <utility>
#endif
using namespace LtsWebSocket;
@@ -17,10 +19,13 @@ ConnectionHandler::ConnectionHandler(QObject* parent)
ConnectionHandler::~ConnectionHandler()
{
#ifdef QT6_WEBSOCKETS_AVAILABLE
for (auto connection : std::as_const(m_connections))
connection->disconnect(this);
#endif
}
#ifdef QT6_WEBSOCKETS_AVAILABLE
bool ConnectionHandler::init(const QString& serviceName, unsigned short port)
{
if (m_server != nullptr)
@@ -87,3 +92,4 @@ void ConnectionHandler::onNewConnection()
<< socket->localPort();
}
}
#endif
qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/connection_handler.h
+20
View File
@@ -4,9 +4,17 @@
#include "logger.h"
#include <QtCore/QObject>
#include <QtCore/QSet>
#include <QtNetwork/QHostAddress>
#ifdef QT6_WEBSOCKETS_AVAILABLE
#include <QtWebSockets/QWebSocketServer>
#include <QtWebSockets/qwebsocketprotocol.h>
#else
namespace LtsWebSocket { class QWebSocketServerStub; }
using QWebSocketServer = LtsWebSocket::QWebSocketServerStub;
namespace QWebSocketProtocol { enum class CloseCode { NormalClosure = 1000 }; }
#endif
namespace LtsWebSocket
{
@@ -21,6 +29,7 @@ class ConnectionHandler : public QObject
explicit ConnectionHandler(QObject* parent = nullptr);
~ConnectionHandler();
#ifdef QT6_WEBSOCKETS_AVAILABLE
bool init(const QString& serviceName, unsigned short port);
void sendToAllClients(ReplyMessage* message);
@@ -29,6 +38,11 @@ class ConnectionHandler : public QObject
{
return m_server->serverPort();
}
#else
bool init(const QString& /*serviceName*/, unsigned short /*port*/) { return false; }
void sendToAllClients(ReplyMessage* /*message*/) {}
unsigned short webSocketPort() { return 0; }
#endif
signals:
@@ -39,12 +53,18 @@ class ConnectionHandler : public QObject
void clientConnected(ClientConnection* client);
private slots:
#ifdef QT6_WEBSOCKETS_AVAILABLE
void onServerError(QWebSocketProtocol::CloseCode closeCode);
void onNewConnection();
#endif
private:
NGL::INGLLogger& m_logger;
#ifdef QT6_WEBSOCKETS_AVAILABLE
QWebSocketServer* m_server;
#else
void* m_server;
#endif
QSet<ClientConnection*> m_connections;
};
} // namespace LtsWebSocket
qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/lts_web_socket_server.cpp
+15
View File
@@ -2,6 +2,7 @@
#include "lts_web_socket_server.h"
#ifdef QT6_WEBSOCKETS_AVAILABLE
#include "client_connection.h"
#include "connection_handler.h"
@@ -120,3 +121,17 @@ void LtsWebSocketServer::onQueueTimerTimeout()
}
} // namespace LtsWebSocket
#else
namespace LtsWebSocket
{
LtsWebSocketServer::LtsWebSocketServer(AbstractClientMessageFactory* /*messageFactory*/, QObject* parent)
: QObject(parent), m_queueTimer(new QTimer(this)), m_logger(getLogger("LtsWebSocket.Server"))
{
}
LtsWebSocketServer::~LtsWebSocketServer() = default;
} // namespace LtsWebSocket
#endif
qt6-after/qt6-migrated-legatus/Lts/Common/LtsWebSocket/lts_web_socket_server.h
+33
View File
@@ -12,6 +12,7 @@
class QTimer;
#ifdef QT6_WEBSOCKETS_AVAILABLE
namespace LtsWebSocket
{
class ConnectionHandler;
@@ -62,3 +63,35 @@ class LTSWEBSOCKETSERVER_EXPORT LtsWebSocketServer : public QObject
LOGGER_T m_logger;
};
} // namespace LtsWebSocket
#else
#include <QtCore/QTimer>
namespace LtsWebSocket
{
class LTSWEBSOCKETSERVER_EXPORT LtsWebSocketServer : public QObject
{
Q_OBJECT
public:
explicit LtsWebSocketServer(AbstractClientMessageFactory* /*messageFactory*/, QObject* parent = nullptr);
virtual ~LtsWebSocketServer();
bool init(const QString& /*serviceName*/, const unsigned short /*port*/ = 0) { return false; }
bool init(const QString& /*serviceName*/, const QPair<quint16, quint16>& /*portRange*/) { return false; }
void sendToAllClients(ReplyMessage* /*message*/) {}
unsigned short webSocketPort() const { return 0; }
void setMessageDelay(qint32 /*delay*/) {}
signals:
void clientDisconnected(void* /*client*/);
void clientConnected(void* /*client*/);
private slots:
void onNewTextMessage(void* /*client*/, const QString& /*message*/) {}
void onQueueTimerTimeout() {}
private:
QTimer* m_queueTimer{nullptr};
LOGGER_T m_logger;
};
} // namespace LtsWebSocket
#endif
qt6-after/qt6-migrated-legatus/Lts/Common/LtsWidgets/CMakeLists.txt
+21 -4
View File
@@ -8,6 +8,21 @@
# Lts Widgets library
#
# Make ${Qt6_Gui} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Gui)
set(Qt6_Gui ${Qt6_Gui})
else()
set(Qt6_Gui "")
endif()
# Make ${Qt6_Widgets} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
set(Qt6_Widgets ${Qt6_Widgets})
else()
set(Qt6_Widgets "")
endif()
SET(ltswidgets_SRCS
#lts_abstract_table_model.h
#lts_checkable_table_model.h
@@ -154,7 +169,8 @@ NGL_ADD_LIBRARY(WS TOOLSWS TOOLSSV LtsWidgets SHARED ${ltswidgets_SRCS})
# Qt6 Dependencies immer setzen (auch wenn BUILD_RTI=OFF)
# Die Library wird gebaut, aber nur bei BUILD_RTI=ON installiert/verwendet
NGL_TARGET_LINK_LIBRARIES(LtsWidgets
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(LtsWidgets
PRIVATE
Qt6::Network # for QHostInfo - for portability
Qt6::Svg
@@ -167,9 +183,10 @@ NGL_TARGET_LINK_LIBRARIES(LtsWidgets
LtsUtilsCore
LtsUtilsSettings
Qt6::Core
Qt6::Widgets
Qt6::Gui
)
${Qt6_Widgets}
${Qt6_Gui}
)
endif()
# Include directories needed for all builds (not just BUILD_RTI)
NGL_TARGET_INCLUDE_DIRECTORIES(LtsWidgets
qt6-after/qt6-migrated-legatus/Lts/Common/TopicEditorBase/CMakeLists.txt
+13 -3
View File
@@ -8,6 +8,14 @@
# Topic Editor Interface
# Make ${Qt6_Widgets} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
set(Qt6_Widgets ${Qt6_Widgets})
else()
set(Qt6_Widgets "")
endif()
ADD_INTERFACE_LIBRARY(
TopicEditorInterface
${CMAKE_CURRENT_SOURCE_DIR}/topic_editor_interface.h
@@ -40,11 +48,13 @@ NGL_TARGET_INCLUDE_DIRECTORIES(TopicEditorBase
${CMAKE_CURRENT_BINARY_DIR}/../ # auto-export file
)
NGL_TARGET_LINK_LIBRARIES(TopicEditorBase
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(TopicEditorBase
LtsScriptTimeline
Qt6::Widgets
${Qt6_Widgets}
Qt6::Core
LtsWidgets
LtsUtilsCore
)
)
endif()
ENDIF(BUILD_RTI)
qt6-after/qt6-migrated-legatus/Lts/Common/httq/AbstractServer.cpp
+9
View File
@@ -1,6 +1,8 @@
#include <QtNetwork/QTcpServer>
#include <QtNetwork/QTcpSocket>
#ifdef QT6_WEBSOCKETS_AVAILABLE
#include <QtWebSockets/QWebSocketServer>
#endif
#include <httq/AbstractServer.h>
#include <httq/HttpRequest.h>
#include <httq/Logger.h>
@@ -43,6 +45,7 @@ void AbstractServer::slotNewConnection()
connect(req, &HttpRequest::signalUpgrade, this, [this, req](QTcpSocket* sock) {
mLogger->debug(QStringLiteral("signalUpgrade"));
#ifdef QT6_WEBSOCKETS_AVAILABLE
QWebSocketServer* wsSvr = webSocketServer();
if (wsSvr == nullptr)
@@ -54,6 +57,12 @@ void AbstractServer::slotNewConnection()
}
wsSvr->handleConnection(sock);
#else
mLogger->debug(QStringLiteral("websocket support not available"));
sock->close();
sock->deleteLater();
return;
#endif
emit sock->readyRead();
});
qt6-after/qt6-migrated-legatus/Lts/Common/httq/CMakeLists.txt
+9 -1
View File
@@ -1,5 +1,13 @@
# Modified CMakeLists.txt from github.com/wille-io/httq
# Make ${Qt6_WebSockets} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::WebSockets)
set(Qt6_WebSockets ${Qt6_WebSockets})
else()
set(Qt6_WebSockets "")
endif()
set(src
include/http_parser.h
include/http_parser.c # TODO: move out of include dir
@@ -26,7 +34,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(httq
NGL_TARGET_LINK_LIBRARIES(httq
Qt6::Core
Qt6::Network
Qt6::WebSockets
${Qt6_WebSockets}
)
NGL_INSTALL_TARGET(httq)
qt6-after/qt6-migrated-legatus/Lts/Common/httq/include/httq/AbstractServer.h
+4
View File
@@ -6,7 +6,9 @@
#include <QtCore/QObject>
class QTcpServer;
#ifdef QT6_WEBSOCKETS_AVAILABLE
class QWebSocketServer;
#endif
namespace httq
{
@@ -22,10 +24,12 @@ class HTTQ_EXPORT AbstractServer : public QObject
virtual bool newHttpConnection(HttpRequest* request) = 0;
#ifdef QT6_WEBSOCKETS_AVAILABLE
virtual QWebSocketServer* webSocketServer() const
{
return nullptr;
}
#endif
virtual LoggerFactory* createLoggerFactory();
LoggerFactory* getLoggerFactory();
qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/CMakeLists.txt
+10 -2
View File
@@ -5,6 +5,14 @@
# Created by Christian Ehrlicher, SLSE, 2016-03-01
#
# Make ${Qt6_Gui} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Gui)
set(Qt6_Gui ${Qt6_Gui})
else()
set(Qt6_Gui "")
endif()
ADD_SUBDIRECTORY(Data)
ADD_SUBDIRECTORY(Gui)
ADD_SUBDIRECTORY(Helper)
@@ -17,7 +25,7 @@ ADD_INTERFACE_LIBRARY(AsbDataPluginInterface
${CMAKE_CURRENT_SOURCE_DIR}/..
DataPluginInterface
advancedSymbology
Qt6::Gui
${Qt6_Gui}
)
#
@@ -37,5 +45,5 @@ ADD_INTERFACE_LIBRARY(AsbSymbolProxyGuiPluginInterface
${CMAKE_CURRENT_SOURCE_DIR}/asb_symbol_proxy_gui_plugin_interface.h
${CMAKE_CURRENT_SOURCE_DIR}/..
GuiPluginInterface
Qt6::Gui
${Qt6_Gui}
)
qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Data/CMakeLists.txt
+13 -3
View File
@@ -5,6 +5,14 @@
# Created by Mike Wille, SLSE, 2016-09-05
#
# Make ${Qt6_Widgets} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
set(Qt6_Widgets ${Qt6_Widgets})
else()
set(Qt6_Widgets "")
endif()
NGL_ADD_LIBRARY(WS AsbData STATIC
asb_foreign_interface_impl.cpp
asb_foreign_interface_impl.h
@@ -17,14 +25,16 @@ TARGET_INCLUDE_DIRECTORIES(AsbData PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/../../../Viewer/SituationMap/Symbology
${CMAKE_CURRENT_SOURCE_DIR}/../../../../Z/src
)
NGL_TARGET_LINK_LIBRARIES(AsbData
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(AsbData
GimDataPluginInterface
AsbDataPluginInterface
AesDataPluginInterface
PpmDataPluginInterface
advancedSymbology
Qt6::Widgets
)
${Qt6_Widgets}
)
endif()
#
# Data Plugin
qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolEditor/CMakeLists.txt
+21 -4
View File
@@ -1,5 +1,20 @@
# CMake script for SymbolEditor
# Make ${Qt6_Gui} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Gui)
set(Qt6_Gui ${Qt6_Gui})
else()
set(Qt6_Gui "")
endif()
# Make ${Qt6_Widgets} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
set(Qt6_Widgets ${Qt6_Widgets})
else()
set(Qt6_Widgets "")
endif()
SET(symboleditor_SRCS
asb_save_as_symbol.cpp
asb_save_as_symbol.h
@@ -43,7 +58,8 @@ TARGET_INCLUDE_DIRECTORIES(AsbSymEditGuiPlugin PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/../../../../Viewer/SituationMap
${CMAKE_CURRENT_SOURCE_DIR}/../../../../Viewer/SituationMap/Symbology
)
NGL_TARGET_LINK_LIBRARIES(AsbSymEditGuiPlugin
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(AsbSymEditGuiPlugin
NGLLogger
LtsWidgets
FlmDataPluginInterface
@@ -54,7 +70,8 @@ NGL_TARGET_LINK_LIBRARIES(AsbSymEditGuiPlugin
LtsSessionData
LtsUtilsGuiDds
Qt6::Core
Qt6::Gui
Qt6::Widgets
)
${Qt6_Gui}
${Qt6_Widgets}
)
endif()
NGL_INSTALL_TARGET(AsbSymEditGuiPlugin)
qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Gui/SymbolProxy/CMakeLists.txt
+4 -2
View File
@@ -23,7 +23,8 @@ TARGET_INCLUDE_DIRECTORIES(AsbSymbolProxyGuiPlugin PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/../../../../Viewer/SituationMap
${CMAKE_CURRENT_SOURCE_DIR}/../../../../Viewer/SituationMap/Symbology
)
NGL_TARGET_LINK_LIBRARIES(AsbSymbolProxyGuiPlugin
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(AsbSymbolProxyGuiPlugin
AsbSymbolProxyGuiPluginInterface
NGLLogger
Qt6::Svg
@@ -34,7 +35,8 @@ NGL_TARGET_LINK_LIBRARIES(AsbSymbolProxyGuiPlugin
FlmDataPluginInterface
OpmDataPluginInterface
advancedSymbology
)
)
endif()
NGL_INSTALL_TARGET(AsbSymbolProxyGuiPlugin)
qt6-after/qt6-migrated-legatus/Lts/Plugins/AdvancedSymbology/Helper/CMakeLists.txt
+13 -3
View File
@@ -5,6 +5,14 @@
# Created by Christian Ehrlicher, SLSE, 2017-11-01
#
# Make ${Qt6_Gui} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Gui)
set(Qt6_Gui ${Qt6_Gui})
else()
set(Qt6_Gui "")
endif()
SET(tmsr_SRCS
table_model_symbol_renderer_base.cpp
table_model_symbol_renderer_base.h
@@ -16,11 +24,13 @@ NGL_TARGET_INCLUDE_DIRECTORIES(AsbHelper
${CMAKE_CURRENT_SOURCE_DIR}/../
${CMAKE_SOURCE_DIR}/Lts/Viewer/SituationMap/
)
NGL_TARGET_LINK_LIBRARIES(AsbHelper
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(AsbHelper
PUBLIC
Qt6::Core
PRIVATE
Qt6::Gui
${Qt6_Gui}
AsbDataPluginInterface
NGLLogger
)
)
endif()
qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/Common/CMakeLists.txt
+13 -3
View File
@@ -8,6 +8,14 @@
#
# Data Plugin
#
# Make ${Qt6_Widgets} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
set(Qt6_Widgets ${Qt6_Widgets})
else()
set(Qt6_Widgets "")
endif()
IF(BUILD_RTI)
SET(alarm_common_gui_SRCS
alm_history_alarm_model.cpp
@@ -17,9 +25,10 @@ SET(alarm_common_gui_SRCS
)
NGL_ADD_LIBRARY2(WS AlmCommon SHARED ${alarm_common_gui_SRCS} )
NGL_TARGET_LINK_LIBRARIES(AlmCommon
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(AlmCommon
PRIVATE
Qt6::Widgets
${Qt6_Widgets}
LtsSession
LtsSessionData
LtsCoordTrans
@@ -34,7 +43,8 @@ NGL_TARGET_LINK_LIBRARIES(AlmCommon
advancedSymbologyGui
ngltools
svcGnaCommon
)
)
endif()
NGL_TARGET_INCLUDE_DIRECTORIES(AlmCommon
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../../Proxies/GuezNasat/
qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigAlarm/CMakeLists.txt
+13 -3
View File
@@ -5,6 +5,14 @@
# Created by Patric Karwat, SLSE, 2016-10-05
#
# Make ${Qt6_Widgets} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
set(Qt6_Widgets ${Qt6_Widgets})
else()
set(Qt6_Widgets "")
endif()
SET(alm_config_alarm_gui_SRCS
alm_config_alarm_gui_plugin.cpp
@@ -21,7 +29,8 @@ NGL_WRAP_UI(alm_config_alarm_gui_SRCS
)
NGL_ADD_LIBRARY(WS AlmConfigAlarmGuiPlugin MODULE ${alm_config_alarm_gui_SRCS})
NGL_TARGET_LINK_LIBRARIES(AlmConfigAlarmGuiPlugin
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(AlmConfigAlarmGuiPlugin
LtsPrinting
AlmCommon
LtsSession
@@ -32,7 +41,7 @@ NGL_TARGET_LINK_LIBRARIES(AlmConfigAlarmGuiPlugin
$<IF:$<TARGET_EXISTS:svcPdmCommon>,svcPdmCommon,> # pdm_enums.h in alm_dialog.cpp
svcPpmCommon
GuiPluginInterface
Qt6::Widgets
${Qt6_Widgets}
LtsCoordTrans
LtsWidgets
LtsDataView
@@ -40,6 +49,7 @@ NGL_TARGET_LINK_LIBRARIES(AlmConfigAlarmGuiPlugin
NGLLogger
LtsUtilsGuiDds
LtsAppManager # get sessions to look on which one to open alarm history
)
)
endif()
NGL_INSTALL_TARGET(AlmConfigAlarmGuiPlugin)
qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/ConfigParticipantAlarm/CMakeLists.txt
+13 -3
View File
@@ -6,6 +6,14 @@
#
# Make ${Qt6_Widgets} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
set(Qt6_Widgets ${Qt6_Widgets})
else()
set(Qt6_Widgets "")
endif()
SET(alm_online_reports_gui_SRCS
alm_participant_model.h
alm_participant_model.cpp
@@ -26,7 +34,8 @@ NGL_WRAP_UI (alm_online_reports_gui_SRCS
)
NGL_ADD_LIBRARY(WS AlmOnlineReportsGuiPlugin MODULE ${alm_online_reports_gui_SRCS})
NGL_TARGET_LINK_LIBRARIES(AlmOnlineReportsGuiPlugin
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(AlmOnlineReportsGuiPlugin
LtsPrinting
LtsSession
LtsSessionData
@@ -35,11 +44,12 @@ NGL_TARGET_LINK_LIBRARIES(AlmOnlineReportsGuiPlugin
$<IF:$<TARGET_EXISTS:svcPdmCommon>,svcPdmCommon,> # pdm_translation.h in alm_dialog.cpp
svcAesCommon
GuiPluginInterface
Qt6::Widgets
${Qt6_Widgets}
PpmCommon
AlmCommon
LtsUtilsGuiDds
LtsUtilsSettings
)
)
endif()
NGL_INSTALL_TARGET(AlmOnlineReportsGuiPlugin)
qt6-after/qt6-migrated-legatus/Lts/Plugins/AlarmManagement/Gui/EmergencyCalls/CMakeLists.txt
+13 -3
View File
@@ -5,6 +5,14 @@
# Created by Patric Karwat, SLSE, 2016-10-05
#
# Make ${Qt6_Widgets} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
set(Qt6_Widgets ${Qt6_Widgets})
else()
set(Qt6_Widgets "")
endif()
SET(alm_emergency_call_gui_SRCS
alm_emergency_call_gui_plugin.cpp
@@ -23,7 +31,8 @@ NGL_WRAP_UI(alm_emergency_call_gui_SRCS
)
NGL_ADD_LIBRARY(WS AlmEmergencyCallGuiPlugin MODULE ${alm_emergency_call_gui_SRCS})
NGL_TARGET_LINK_LIBRARIES(AlmEmergencyCallGuiPlugin
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(AlmEmergencyCallGuiPlugin
LtsPrinting
AlmCommon
svcTabCommon
@@ -38,7 +47,7 @@ NGL_TARGET_LINK_LIBRARIES(AlmEmergencyCallGuiPlugin
#svcPdmCommon # pdm_enums.h in alm_dialog.cpp
#svcPpmCommon
GuiPluginInterface
Qt6::Widgets
${Qt6_Widgets}
LtsCoordTrans
LtsWidgets
LtsDataView
@@ -46,6 +55,7 @@ NGL_TARGET_LINK_LIBRARIES(AlmEmergencyCallGuiPlugin
NGLLogger
LtsUtilsGuiDds
LtsAppManager # get sessions to look on which one to open alarm history
)
)
endif()
NGL_INSTALL_TARGET(AlmEmergencyCallGuiPlugin)
qt6-after/qt6-migrated-legatus/Lts/Plugins/AppStarter/Gui/AppStart/CMakeLists.txt
+13 -3
View File
@@ -6,22 +6,32 @@
# Created by Mike Wille, SLSE, 2016-11-03
#
# Make ${Qt6_Widgets} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
set(Qt6_Widgets ${Qt6_Widgets})
else()
set(Qt6_Widgets "")
endif()
SET(AppStarterGuiPlugin_SRCS
app_gui_plugin.h
app_gui_plugin.cpp
)
NGL_ADD_LIBRARY(WS AppStarterGuiPlugin MODULE ${AppStarterGuiPlugin_SRCS})
NGL_TARGET_LINK_LIBRARIES(AppStarterGuiPlugin
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(AppStarterGuiPlugin
LtsSession
AppGuiPluginInterface
LtsAppManager
LtsAppDescriptor
Qt6::Widgets
${Qt6_Widgets}
LtsWidgets
LtsSessionData
LtsUtilsSettings
$<IF:$<TARGET_EXISTS:svcIsmCommon>,svcIsmCommon,> # for DbAdmin right
)
)
endif()
NGL_INSTALL_TARGET(AppStarterGuiPlugin)
qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AesInfo/CMakeLists.txt
+13 -3
View File
@@ -4,6 +4,14 @@
# $Author$
# Created by hjl, SLSE, 2017-03-22
#
# Make ${Qt6_Widgets} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
set(Qt6_Widgets ${Qt6_Widgets})
else()
set(Qt6_Widgets "")
endif()
SET(aes_info_gui_SRCS
aes_info_gui_plugin.h
aes_info_gui_plugin.cpp
@@ -22,7 +30,8 @@ NGL_WRAP_UI(aes_info_gui_SRCS
)
NGL_ADD_LIBRARY(WS AesInfoGuiPlugin MODULE ${aes_info_gui_SRCS})
NGL_TARGET_LINK_LIBRARIES(AesInfoGuiPlugin
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(AesInfoGuiPlugin
AesInfoGuiPluginInterface
NGLLogger
PdmDataPluginInterface
@@ -35,7 +44,7 @@ NGL_TARGET_LINK_LIBRARIES(AesInfoGuiPlugin
AesMineAreaGuiPluginInterface
AesDangerAreaGuiPluginInterface
SituationMapGuiPluginInterface
Qt6::Widgets
${Qt6_Widgets}
LtsWidgets
LtsSession
LtsSessionData
@@ -43,6 +52,7 @@ NGL_TARGET_LINK_LIBRARIES(AesInfoGuiPlugin
LtsUtilsSettings
LtsCoordTrans
ngltools
)
)
endif()
NGL_INSTALL_TARGET(AesInfoGuiPlugin)
qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/AirSupport/CMakeLists.txt
+13 -3
View File
@@ -5,6 +5,14 @@
# Created by hjl, SLSE, 2017-06-06
#
# Make ${Qt6_Widgets} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
set(Qt6_Widgets ${Qt6_Widgets})
else()
set(Qt6_Widgets "")
endif()
ADD_INTERFACE_LIBRARY(
AesAirSupportGuiPluginInterface
${CMAKE_CURRENT_SOURCE_DIR}/aes_air_support_gui_plugin_interface.h
@@ -33,7 +41,8 @@ NGL_WRAP_UI(aes_air_support_impact_gui_SRCS
)
NGL_ADD_LIBRARY(WS AesAirSupportGuiPlugin MODULE ${aes_air_support_impact_gui_SRCS})
NGL_TARGET_LINK_LIBRARIES(AesAirSupportGuiPlugin
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(AesAirSupportGuiPlugin
AesBaseGui
AesAirSupportGuiPluginInterface
AesDataPluginInterface
@@ -50,7 +59,8 @@ NGL_TARGET_LINK_LIBRARIES(AesAirSupportGuiPlugin
ngltools
PpmDataPluginInterface
SituationMapGuiPluginInterface
Qt6::Widgets
)
${Qt6_Widgets}
)
endif()
NGL_INSTALL_TARGET(AesAirSupportGuiPlugin)
qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/BCContamination/CMakeLists.txt
+13 -3
View File
@@ -5,6 +5,14 @@
# Created by Patric Karwat, SLSE, 2016-07-03
#
# Make ${Qt6_Widgets} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
set(Qt6_Widgets ${Qt6_Widgets})
else()
set(Qt6_Widgets "")
endif()
ADD_INTERFACE_LIBRARY(
AesBCContaminationGuiPluginInterface
${CMAKE_CURRENT_SOURCE_DIR}/aes_bccontamination_gui_plugin_interface.h
@@ -33,7 +41,8 @@ NGL_WRAP_UI(aes_bccontamination_gui_SRCS
)
NGL_ADD_LIBRARY(WS AesBcContaminationGuiPlugin MODULE ${aes_bccontamination_gui_SRCS})
NGL_TARGET_LINK_LIBRARIES(AesBcContaminationGuiPlugin
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(AesBcContaminationGuiPlugin
AesBaseGui
AesBCContaminationGuiPluginInterface
ngltools
@@ -42,10 +51,11 @@ NGL_TARGET_LINK_LIBRARIES(AesBcContaminationGuiPlugin
LtsSession
AesDataPluginInterface
AesInfoGuiPluginInterface
Qt6::Widgets
${Qt6_Widgets}
LtsWidgets
LtsUtilsSettings
)
)
endif()
NGL_INSTALL_TARGET(AesBcContaminationGuiPlugin)
qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Base/CMakeLists.txt
+13 -3
View File
@@ -6,6 +6,14 @@
# Created by Malte Diers, SLSE, 2017-02-13
#
# Make ${Qt6_Widgets} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
set(Qt6_Widgets ${Qt6_Widgets})
else()
set(Qt6_Widgets "")
endif()
SET(aes_base_gui_SRCS
aes_base_edit.cpp
aes_base_edit.h
@@ -32,7 +40,8 @@ NGL_TARGET_INCLUDE_DIRECTORIES(AesBaseGui
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../../../Services/
)
NGL_TARGET_LINK_LIBRARIES(AesBaseGui
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(AesBaseGui
PRIVATE
ExmDataPluginInterface
LtsPrinting
@@ -50,7 +59,8 @@ NGL_TARGET_LINK_LIBRARIES(AesBaseGui
LtsSessionData
LtsUtilsGuiDds
LtsWidgets
Qt6::Widgets
)
${Qt6_Widgets}
)
endif()
NGL_INSTALL_TARGET(AesBaseGui)
qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Borderline/CMakeLists.txt
+13 -3
View File
@@ -5,6 +5,14 @@
# Created by hjl, SLSE, 2017-06-06
#
# Make ${Qt6_Widgets} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
set(Qt6_Widgets ${Qt6_Widgets})
else()
set(Qt6_Widgets "")
endif()
ADD_INTERFACE_LIBRARY(
AesBorderlineGuiPluginInterface
${CMAKE_CURRENT_SOURCE_DIR}/aes_borderline_gui_plugin_interface.h
@@ -31,7 +39,8 @@ NGL_WRAP_UI(aes_borderline_gui_SRCS
)
NGL_ADD_LIBRARY(WS AesBorderlineGuiPlugin MODULE ${aes_borderline_gui_SRCS})
NGL_TARGET_LINK_LIBRARIES(AesBorderlineGuiPlugin
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(AesBorderlineGuiPlugin
AesBaseGui
AesBorderlineGuiPluginInterface
ngltools
@@ -40,7 +49,7 @@ NGL_TARGET_LINK_LIBRARIES(AesBorderlineGuiPlugin
AesInfoGuiPluginInterface
FlmDataPluginInterface
NGLLogger
Qt6::Widgets
${Qt6_Widgets}
LtsWidgets
LtsSession
LtsSessionData
@@ -48,6 +57,7 @@ NGL_TARGET_LINK_LIBRARIES(AesBorderlineGuiPlugin
SituationMapGuiPluginInterface
LtsUtilsGuiDds
LtsUtilsSettings
)
)
endif()
NGL_INSTALL_TARGET(AesBorderlineGuiPlugin)
qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/ChargeAdministration/CMakeLists.txt
+13 -3
View File
@@ -5,6 +5,14 @@
# Created by Malte Diers, SLSE, 2016-07-03
#
# Make ${Qt6_Widgets} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
set(Qt6_Widgets ${Qt6_Widgets})
else()
set(Qt6_Widgets "")
endif()
SET(aes_charge_administration_gui_SRCS
aes_charge_administration_gui_plugin.cpp
aes_charge_administration_gui_plugin.h
@@ -29,7 +37,8 @@ NGL_WRAP_UI(aes_charge_administration_gui_SRCS
)
NGL_ADD_LIBRARY(WS AesChargeAdministrationGuiPlugin MODULE ${aes_charge_administration_gui_SRCS})
NGL_TARGET_LINK_LIBRARIES(AesChargeAdministrationGuiPlugin
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(AesChargeAdministrationGuiPlugin
LtsPrinting
AesBaseGui
LtsDataView
@@ -40,9 +49,10 @@ NGL_TARGET_LINK_LIBRARIES(AesChargeAdministrationGuiPlugin
AesDataPluginInterface
PpmGuiComboboxPluginInterface
$<IF:$<TARGET_EXISTS:svcPdmCommon>,svcPdmCommon,>
Qt6::Widgets
${Qt6_Widgets}
LtsWidgets
LtsUtilsSettings
)
)
endif()
NGL_INSTALL_TARGET(AesChargeAdministrationGuiPlugin)
qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/ChargeEffect/CMakeLists.txt
+13 -3
View File
@@ -5,6 +5,14 @@
# Created by Malte Diers, SLSE, 2017-04-06
#
# Make ${Qt6_Widgets} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
set(Qt6_Widgets ${Qt6_Widgets})
else()
set(Qt6_Widgets "")
endif()
ADD_INTERFACE_LIBRARY(
AesChargeEffectGuiPluginInterface
${CMAKE_CURRENT_SOURCE_DIR}/aes_charge_effect_gui_plugin_interface.h
@@ -23,7 +31,8 @@ NGL_WRAP_UI(aes_charge_effect_gui_SRCS
)
NGL_ADD_LIBRARY(WS AesChargeEffectGuiPlugin MODULE ${aes_charge_effect_gui_SRCS})
NGL_TARGET_LINK_LIBRARIES(AesChargeEffectGuiPlugin
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(AesChargeEffectGuiPlugin
AesBaseGui
AesChargeEffectGuiPluginInterface
ngltools
@@ -33,12 +42,13 @@ NGL_TARGET_LINK_LIBRARIES(AesChargeEffectGuiPlugin
PpmGuiComboboxPluginInterface
PpmDataPluginInterface
PpmParticipantSelectionGui
Qt6::Widgets
${Qt6_Widgets}
LtsWidgets
AsbDataPluginInterface
advancedSymbologyGui
LtsUtilsSettings
)
)
endif()
NGL_INSTALL_TARGET(AesChargeEffectGuiPlugin)
qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/DangerArea/CMakeLists.txt
+13 -3
View File
@@ -5,6 +5,14 @@
# Created by Patric Karwat, SLSE, 2016-07-03
#
# Make ${Qt6_Widgets} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
set(Qt6_Widgets ${Qt6_Widgets})
else()
set(Qt6_Widgets "")
endif()
ADD_INTERFACE_LIBRARY(
AesDangerAreaGuiPluginInterface
${CMAKE_CURRENT_SOURCE_DIR}/aes_danger_area_gui_plugin_interface.h
@@ -30,7 +38,8 @@ NGL_WRAP_UI(aes_danger_area_gui_SRCS
)
NGL_ADD_LIBRARY2(WS AesDangerAreaGuiPlugin MODULE ${aes_danger_area_gui_SRCS})
NGL_TARGET_LINK_LIBRARIES(AesDangerAreaGuiPlugin
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(AesDangerAreaGuiPlugin
AesBaseGui
ngltools # dtg
NGLLogger
@@ -40,10 +49,11 @@ NGL_TARGET_LINK_LIBRARIES(AesDangerAreaGuiPlugin
PdmGuiPluginInterface
AesInfoGuiPluginInterface
SituationMapGuiPluginInterface
Qt6::Widgets
${Qt6_Widgets}
LtsWidgets
LtsDataView
LtsUtilsGuiDds
LtsUtilsSettings
)
)
endif()
qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/Explosion/CMakeLists.txt
+13 -3
View File
@@ -8,6 +8,14 @@
#
# LIBRARY for AesEffectClusterModel (which is used at AirSupportPlugin)
#
# Make ${Qt6_Widgets} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
set(Qt6_Widgets ${Qt6_Widgets})
else()
set(Qt6_Widgets "")
endif()
SET(AesEffectCluster_SRCS
aes_effect_cluster_model.cpp
aes_effect_cluster_model.h
@@ -83,7 +91,8 @@ NGL_WRAP_UI(aes_explosion_gui_SRCS
)
NGL_ADD_LIBRARY(WS AesExplosionGuiPlugin MODULE ${aes_explosion_gui_SRCS})
NGL_TARGET_LINK_LIBRARIES(AesExplosionGuiPlugin
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(AesExplosionGuiPlugin
AesBaseGui
ngltools
NGLLogger
@@ -96,7 +105,7 @@ NGL_TARGET_LINK_LIBRARIES(AesExplosionGuiPlugin
PpmParticipantSelectionGui
SituationMapGuiPluginInterface
Qt6::Widgets
${Qt6_Widgets}
LtsWidgets
LtsDataView
LtsUtilsGuiDds
@@ -109,7 +118,8 @@ NGL_TARGET_LINK_LIBRARIES(AesExplosionGuiPlugin
AsmDataPluginInterface
ExmDataPluginInterface
saaTelegrams
)
)
endif()
NGL_INSTALL_TARGET(AesExplosionGuiPlugin)
qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/FunctionalArea/CMakeLists.txt
+13 -3
View File
@@ -5,6 +5,14 @@
# Created by Malte Diers, SLSE, 2017-04-06
#
# Make ${Qt6_Widgets} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
set(Qt6_Widgets ${Qt6_Widgets})
else()
set(Qt6_Widgets "")
endif()
ADD_INTERFACE_LIBRARY(
AesFunctionalAreaGuiPluginInterface
${CMAKE_CURRENT_SOURCE_DIR}/aes_functional_area_gui_plugin_interface.h
@@ -30,7 +38,8 @@ NGL_WRAP_UI(aes_functional_area_gui_SRCS
)
NGL_ADD_LIBRARY(WS AesFunctionalAreaGuiPlugin MODULE ${aes_functional_area_gui_SRCS})
NGL_TARGET_LINK_LIBRARIES(AesFunctionalAreaGuiPlugin
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(AesFunctionalAreaGuiPlugin
AesBaseGui
AesFunctionalAreaGuiPluginInterface
ngltools
@@ -40,12 +49,13 @@ NGL_TARGET_LINK_LIBRARIES(AesFunctionalAreaGuiPlugin
PpmGuiComboboxPluginInterface
PpmDataPluginInterface
PpmParticipantSelectionGui
Qt6::Widgets
${Qt6_Widgets}
LtsWidgets
AsbDataPluginInterface
advancedSymbologyGui
LtsUtilsSettings
)
)
endif()
NGL_INSTALL_TARGET(AesFunctionalAreaGuiPlugin)
qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/GasPipe/CMakeLists.txt
+13 -3
View File
@@ -5,6 +5,14 @@
# Created by hjl, SLSE, 2017-06-06
#
# Make ${Qt6_Widgets} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
set(Qt6_Widgets ${Qt6_Widgets})
else()
set(Qt6_Widgets "")
endif()
ADD_INTERFACE_LIBRARY(
AesGasPipeGuiPluginInterface
${CMAKE_CURRENT_SOURCE_DIR}/aes_gas_pipe_gui_plugin_interface.h
@@ -31,7 +39,8 @@ NGL_WRAP_UI(aes_gas_pipe_gui_SRCS
)
NGL_ADD_LIBRARY(WS AesGasPipeGuiPlugin MODULE ${aes_gas_pipe_gui_SRCS})
NGL_TARGET_LINK_LIBRARIES(AesGasPipeGuiPlugin
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(AesGasPipeGuiPlugin
AesBaseGui
AesGasPipeGuiPluginInterface
ngltools
@@ -39,7 +48,7 @@ NGL_TARGET_LINK_LIBRARIES(AesGasPipeGuiPlugin
PdmGuiPluginInterface
AesInfoGuiPluginInterface
NGLLogger
Qt6::Widgets
${Qt6_Widgets}
LtsWidgets
LtsSession
LtsSessionData
@@ -47,6 +56,7 @@ NGL_TARGET_LINK_LIBRARIES(AesGasPipeGuiPlugin
SituationMapGuiPluginInterface
LtsUtilsGuiDds
LtsUtilsSettings
)
)
endif()
NGL_INSTALL_TARGET(AesGasPipeGuiPlugin)
qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineArea/CMakeLists.txt
+13 -3
View File
@@ -6,6 +6,14 @@
# Created by Mike Wille, SLSE, 2016-09-26
#
# Make ${Qt6_Widgets} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
set(Qt6_Widgets ${Qt6_Widgets})
else()
set(Qt6_Widgets "")
endif()
ADD_INTERFACE_LIBRARY(
AesMineAreaGuiPluginInterface
${CMAKE_CURRENT_SOURCE_DIR}/aes_mine_area_gui_plugin_interface.h
@@ -31,7 +39,8 @@ NGL_WRAP_UI(aes_mine_area_gui_SRCS
)
NGL_ADD_LIBRARY(WS AesMineAreaGuiPlugin MODULE ${aes_mine_area_gui_SRCS})
NGL_TARGET_LINK_LIBRARIES(AesMineAreaGuiPlugin
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(AesMineAreaGuiPlugin
AesBaseGui
NGLLogger
svcAesCommon
@@ -40,12 +49,13 @@ NGL_TARGET_LINK_LIBRARIES(AesMineAreaGuiPlugin
AesMineAreaGuiPluginInterface
PdmGuiPluginInterface
SituationMapGuiPluginInterface
Qt6::Widgets
${Qt6_Widgets}
LtsWidgets
LtsUtilsGuiDds
LtsDataView
ngltools
LtsUtilsSettings
)
)
endif()
NGL_INSTALL_TARGET(AesMineAreaGuiPlugin)
qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineCorridor/CMakeLists.txt
+13 -3
View File
@@ -5,6 +5,14 @@
# Created by Patric Karwat, SLSE, 2016-07-03
#
# Make ${Qt6_Widgets} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
set(Qt6_Widgets ${Qt6_Widgets})
else()
set(Qt6_Widgets "")
endif()
ADD_INTERFACE_LIBRARY(
AesMineCorridorGuiPluginInterface
${CMAKE_CURRENT_SOURCE_DIR}/aes_mine_corridor_gui_plugin_interface.h
@@ -30,7 +38,8 @@ NGL_WRAP_UI(aes_mine_corridor_gui_SRCS
)
NGL_ADD_LIBRARY2(WS AesMineCorridorGuiPlugin MODULE ${aes_mine_corridor_gui_SRCS})
NGL_TARGET_LINK_LIBRARIES(AesMineCorridorGuiPlugin
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(AesMineCorridorGuiPlugin
AesBaseGui
ngltools # dtg
NGLLogger
@@ -40,10 +49,11 @@ NGL_TARGET_LINK_LIBRARIES(AesMineCorridorGuiPlugin
AesInfoGuiPluginInterface
PpmGuiComboboxPluginInterface
SituationMapGuiPluginInterface
Qt6::Widgets
${Qt6_Widgets}
LtsWidgets
LtsDataView
LtsUtilsGuiDds
LtsUtilsSettings
)
)
endif()
qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/MineSingleVirtual/CMakeLists.txt
+13 -3
View File
@@ -5,6 +5,14 @@
# Created by Patric Karwat, SLSE, 2016-07-03
#
# Make ${Qt6_Widgets} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
set(Qt6_Widgets ${Qt6_Widgets})
else()
set(Qt6_Widgets "")
endif()
ADD_INTERFACE_LIBRARY(
AesMineSingleVirtualGuiPluginInterface
${CMAKE_CURRENT_SOURCE_DIR}/aes_mine_single_virtual_gui_plugin_interface.h
@@ -46,7 +54,8 @@ NGL_WRAP_UI(aes_mine_single_virtual_gui_SRCS
)
NGL_ADD_LIBRARY(WS AesMineSingleVirtualGuiPlugin MODULE ${aes_mine_single_virtual_gui_SRCS})
NGL_TARGET_LINK_LIBRARIES(AesMineSingleVirtualGuiPlugin
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(AesMineSingleVirtualGuiPlugin
AesBaseGui
AesMineSingleVirtualGuiPluginInterface
ngltools
@@ -55,10 +64,11 @@ NGL_TARGET_LINK_LIBRARIES(AesMineSingleVirtualGuiPlugin
LtsSession
AesDataPluginInterface
AesInfoGuiPluginInterface
Qt6::Widgets
${Qt6_Widgets}
LtsWidgets
LtsUtilsSettings
)
)
endif()
NGL_INSTALL_TARGET(AesMineSingleVirtualGuiPlugin)
qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/NContamination/CMakeLists.txt
+13 -3
View File
@@ -5,6 +5,14 @@
# Created by Patric Karwat, SLSE, 2016-07-03
#
# Make ${Qt6_Widgets} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
set(Qt6_Widgets ${Qt6_Widgets})
else()
set(Qt6_Widgets "")
endif()
ADD_INTERFACE_LIBRARY(
AesNContaminationGuiPluginInterface
${CMAKE_CURRENT_SOURCE_DIR}/aes_ncontamination_gui_plugin_interface.h
@@ -30,7 +38,8 @@ NGL_WRAP_UI(aes_ncontamination_gui_SRCS
)
NGL_ADD_LIBRARY(WS AesNContaminationGuiPlugin MODULE ${aes_ncontamination_gui_SRCS})
NGL_TARGET_LINK_LIBRARIES(AesNContaminationGuiPlugin
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(AesNContaminationGuiPlugin
AesBaseGui
ngltools # dtg
NGLLogger
@@ -39,12 +48,13 @@ NGL_TARGET_LINK_LIBRARIES(AesNContaminationGuiPlugin
AesNContaminationGuiPluginInterface
PpmGuiComboboxPluginInterface
SituationMapGuiPluginInterface
Qt6::Widgets
${Qt6_Widgets}
LtsWidgets
LtsDataView
LtsUtilsGuiDds
LtsUtilsSettings
)
)
endif()
NGL_INSTALL_TARGET(AesNContaminationGuiPlugin)
qt6-after/qt6-migrated-legatus/Lts/Plugins/AreaEffectSimulation/Gui/TechnicalArea/CMakeLists.txt
+13 -3
View File
@@ -5,6 +5,14 @@
# Created by Malte Diers, SLSE, 2017-04-06
#
# Make ${Qt6_Widgets} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
set(Qt6_Widgets ${Qt6_Widgets})
else()
set(Qt6_Widgets "")
endif()
ADD_INTERFACE_LIBRARY(
AesTechnicalAreaGuiPluginInterface
${CMAKE_CURRENT_SOURCE_DIR}/aes_technical_area_gui_plugin_interface.h
@@ -30,17 +38,19 @@ NGL_WRAP_UI(aes_technical_area_gui_SRCS
)
NGL_ADD_LIBRARY(WS AesTechnicalAreaGuiPlugin MODULE ${aes_technical_area_gui_SRCS})
NGL_TARGET_LINK_LIBRARIES(AesTechnicalAreaGuiPlugin
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(AesTechnicalAreaGuiPlugin
AesBaseGui
AesTechnicalAreaGuiPluginInterface
ngltools
NGLLogger
LtsSessionData
AesDataPluginInterface
Qt6::Widgets
${Qt6_Widgets}
LtsWidgets
LtsUtilsSettings
)
)
endif()
NGL_INSTALL_TARGET(AesTechnicalAreaGuiPlugin)
qt6-after/qt6-migrated-legatus/Lts/Plugins/AssetManagement/Gui/AsmTrainingAreaEdit/CMakeLists.txt
+13 -3
View File
@@ -5,6 +5,14 @@
# Created by Christian Ehrlicher, SLSE, 2016-02-29
#
# Make ${Qt6_Widgets} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
set(Qt6_Widgets ${Qt6_Widgets})
else()
set(Qt6_Widgets "")
endif()
SET(asm_gui_SRCS
asm_training_area_dialog.cpp
asm_training_area_dialog.h
@@ -22,7 +30,8 @@ NGL_WRAP_UI(asm_gui_SRCS
)
NGL_ADD_LIBRARY(WS AsmGuiPlugin MODULE ${asm_gui_SRCS})
NGL_TARGET_LINK_LIBRARIES(AsmGuiPlugin
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(AsmGuiPlugin
ngltools # dtg
NGLLogger
LtsSession
@@ -31,7 +40,7 @@ NGL_TARGET_LINK_LIBRARIES(AsmGuiPlugin
OpmDataPluginInterface
AsmGuiPluginInterface
FlmDataPluginInterface
Qt6::Widgets
${Qt6_Widgets}
LtsCoordTrans
ltsCoordWidget
LtsWidgets
@@ -41,7 +50,8 @@ NGL_TARGET_LINK_LIBRARIES(AsmGuiPlugin
LtsSessionData
ProjectConfig
LtsUtilsGuiConnectDialog
)
)
endif()
NGL_INSTALL_TARGET(AsmGuiPlugin)
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/CMakeLists.txt
+3 -3
View File
@@ -6,9 +6,9 @@
#
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)
FIND_PACKAGE(Boost COMPONENTS system) # system wird nicht gebraucht, aber ohne Komponente wird das Boost::boost imported Target nicht angelegt (cmake <= 3.5.2)
ELSE()
FIND_PACKAGE(Boost REQUIRED)
FIND_PACKAGE(Boost)
ENDIF()
ADD_SUBDIRECTORY(Data)
@@ -22,7 +22,7 @@ ADD_SUBDIRECTORY(Shared)
ADD_INTERFACE_LIBRARY(AvmMenuEditGuiPluginInterface
${CMAKE_CURRENT_SOURCE_DIR}/avm_menu_edit_gui_plugin_interface.h
${CMAKE_CURRENT_SOURCE_DIR}/..
GuiPluginInterface TopicReplayInterface TopicEditorInterface Qt6::Core AvmShared Boost::boost
GuiPluginInterface TopicReplayInterface TopicEditorInterface Qt6::Core AvmShared $<IF:$<TARGET_EXISTS:Boost::boost>,Boost::boost,>
)
#
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Data/CMakeLists.txt
+1 -1
View File
@@ -41,6 +41,6 @@ NGL_TARGET_LINK_LIBRARIES(AvmDataPlugin
LtsUtilsGuiStyleManager
LtsUtilsGuiConnectDialog
LtsUtilsSettings
Boost::boost
$<IF:$<TARGET_EXISTS:Boost::boost>,Boost::boost,>
)
NGL_INSTALL_TARGET(AvmDataPlugin)
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/AVMenuEdit/CMakeLists.txt
+14 -4
View File
@@ -5,6 +5,14 @@
# Created by Patric Karwat, SLSE, 2016-10-05
#
# Make ${Qt6_Widgets} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
set(Qt6_Widgets ${Qt6_Widgets})
else()
set(Qt6_Widgets "")
endif()
SET(avm_menu_edit_gui_SRCS
avm_menu_edit_gui_plugin.cpp
avm_menu_edit_gui_plugin.h
@@ -56,7 +64,8 @@ NGL_WRAP_UI(avm_menu_edit_gui_SRCS
)
NGL_ADD_LIBRARY(WS avmMenuEditGuiPlugin MODULE ${avm_menu_edit_gui_SRCS})
NGL_TARGET_LINK_LIBRARIES(avmMenuEditGuiPlugin
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(avmMenuEditGuiPlugin
AvmDataPluginInterface
AvmMenuEditGuiPluginInterface
AvmShared
@@ -78,9 +87,10 @@ NGL_TARGET_LINK_LIBRARIES(avmMenuEditGuiPlugin
ngltools
nglwidgets
OpmDataPluginInterface
Qt6::Widgets
${Qt6_Widgets}
TopicEditorBase
Boost::boost
)
$<IF:$<TARGET_EXISTS:Boost::boost>,Boost::boost,>
)
endif()
NGL_INSTALL_TARGET(avmMenuEditGuiPlugin)
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CMakeLists.txt
+13 -3
View File
@@ -5,6 +5,14 @@
# Created by Hannes Baeuerle, SLSE, 2017-08-18
#
# Make ${Qt6_Widgets} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
set(Qt6_Widgets ${Qt6_Widgets})
else()
set(Qt6_Widgets "")
endif()
SET(avm_combat_net_radio_gui_SRCS
CombatNetRadioConfiguration/avm_cnr_json_helper.h
CombatNetRadioConfiguration/avm_cnr_json_helper.cpp
@@ -76,7 +84,8 @@ NGL_WRAP_UI(avm_combat_net_radio_gui_SRCS
)
NGL_ADD_LIBRARY(WS avmCombatNetRadioGuiPlugin MODULE ${avm_combat_net_radio_gui_SRCS})
NGL_TARGET_LINK_LIBRARIES(avmCombatNetRadioGuiPlugin
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(avmCombatNetRadioGuiPlugin
svcCnrHelper
LtsPrinting
nglwidgets
@@ -91,11 +100,12 @@ NGL_TARGET_LINK_LIBRARIES(avmCombatNetRadioGuiPlugin
svcAvmCommon
AvmShared
svcExmClient
Qt6::Widgets
${Qt6_Widgets}
LtsWidgets
LtsDataView
LtsUtilsGuiDds
LtsUtilsSettings
)
)
endif()
NGL_INSTALL_TARGET(avmCombatNetRadioGuiPlugin)
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/Eloka/CMakeLists.txt
+13 -3
View File
@@ -5,6 +5,14 @@
# Created by Astrid Mueller, SGAS, 2017-10-17
#
# Make ${Qt6_Widgets} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
set(Qt6_Widgets ${Qt6_Widgets})
else()
set(Qt6_Widgets "")
endif()
SET(avm_eloka_gui_SRCS
avm_eloka_gui_plugin.cpp
avm_eloka_gui_plugin.h
@@ -22,7 +30,8 @@ NGL_WRAP_UI(avm_eloka_gui_SRCS
)
NGL_ADD_LIBRARY(WS AvmElokaGuiPlugin MODULE ${avm_eloka_gui_SRCS})
NGL_TARGET_LINK_LIBRARIES(AvmElokaGuiPlugin
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(AvmElokaGuiPlugin
LtsPrinting
NGLLogger
LtsSession
@@ -31,11 +40,12 @@ NGL_TARGET_LINK_LIBRARIES(AvmElokaGuiPlugin
AvmDataPluginInterface
PpmDataPluginInterface
svcAvmCommon
Qt6::Widgets
${Qt6_Widgets}
LtsWidgets
LtsDataView
LtsUtilsGuiDds
ngltools
)
)
endif()
NGL_INSTALL_TARGET(AvmElokaGuiPlugin)
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/MobileVideoSystem/CMakeLists.txt
+14 -4
View File
@@ -5,6 +5,14 @@
# Created by hjl, SLSE, 2016-12-01
#
# Make ${Qt6_Widgets} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
set(Qt6_Widgets ${Qt6_Widgets})
else()
set(Qt6_Widgets "")
endif()
SET(mvs_gui_SRCS
avm_mvs_video_team_gui_plugin.h
avm_mvs_video_team_gui_plugin.cpp
@@ -31,9 +39,10 @@ QT5_WRAP_UI(mvs_gui_SRCS
)
NGL_ADD_LIBRARY(WS MvsVideoTeamGuiPlugin MODULE ${mvs_gui_SRCS})
NGL_TARGET_LINK_LIBRARIES(MvsVideoTeamGuiPlugin
# LtsPrinting
Qt6::Widgets
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(MvsVideoTeamGuiPlugin
# LtsPrinting
${Qt6_Widgets}
LtsWidgets
LtsDataView
LtsPrinting
@@ -45,6 +54,7 @@ NGL_TARGET_LINK_LIBRARIES(MvsVideoTeamGuiPlugin
LtsSession
LtsUtilsGuiDds
LtsUtilsSettings
)
)
endif()
NGL_INSTALL_TARGET(MvsVideoTeamGuiPlugin)
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/TrainingVoiceCommunication/CMakeLists.txt
+13 -3
View File
@@ -5,6 +5,14 @@
# Created by Hannes Baeuerle, SLSE, 2017-08-18
#
# Make ${Qt6_Widgets} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
set(Qt6_Widgets ${Qt6_Widgets})
else()
set(Qt6_Widgets "")
endif()
SET(avm_tvc_gui_SRCS
avm_training_voice_gui_plugin.cpp
avm_training_voice_gui_plugin.h
@@ -22,7 +30,8 @@ NGL_WRAP_UI(avm_tvc_gui_SRCS
)
NGL_ADD_LIBRARY(WS avmTrainingVoiceGuiPlugin MODULE ${avm_tvc_gui_SRCS})
NGL_TARGET_LINK_LIBRARIES(avmTrainingVoiceGuiPlugin
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(avmTrainingVoiceGuiPlugin
LtsPrinting
nglwidgets
NGLLogger
@@ -34,11 +43,12 @@ NGL_TARGET_LINK_LIBRARIES(avmTrainingVoiceGuiPlugin
svcAvmCommon
AvmShared
svcExmClient
Qt6::Widgets
${Qt6_Widgets}
LtsWidgets
LtsDataView
LtsUtilsGuiDds
LtsUtilsSettings
)
)
endif()
NGL_INSTALL_TARGET(avmTrainingVoiceGuiPlugin)
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Shared/CMakeLists.txt
+14 -4
View File
@@ -6,6 +6,14 @@
# Created by Christian Fröbel, NLSE, 2018-04-19
#
# Make ${Qt6_Gui} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Gui)
set(Qt6_Gui ${Qt6_Gui})
else()
set(Qt6_Gui "")
endif()
IF(BUILD_RTI)
set(SRCS
@@ -32,18 +40,20 @@ NGL_TARGET_INCLUDE_DIRECTORIES(AvmShared
${CMAKE_CURRENT_SOURCE_DIR}/../../Services/
${CMAKE_CURRENT_SOURCE_DIR}/../../Common/
)
NGL_TARGET_LINK_LIBRARIES(AvmShared
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(AvmShared
PUBLIC
Qt6::Core
svcAvmCommon
Boost::boost
$<IF:$<TARGET_EXISTS:Boost::boost>,Boost::boost,>
PRIVATE
LtsMultiMonitor
LtsUtilsSettings
Qt6::Gui
${Qt6_Gui}
nglsettings
ngltools
)
)
endif()
NGL_INSTALL_TARGET(AvmShared)
ENDIF(BUILD_RTI)
qt6-after/qt6-migrated-legatus/Lts/Plugins/Battery/Gui/CMakeLists.txt
+13 -3
View File
@@ -5,18 +5,28 @@
# Created by Mike Wille, NLS, 2019-01-21
#
# Make ${Qt6_Widgets} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
set(Qt6_Widgets ${Qt6_Widgets})
else()
set(Qt6_Widgets "")
endif()
SET(bat_gui_SRCS
bat_gui_plugin.cpp
bat_gui_plugin.h
)
NGL_ADD_LIBRARY(WS BatGuiPlugin MODULE ${bat_gui_SRCS})
NGL_TARGET_LINK_LIBRARIES(BatGuiPlugin
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(BatGuiPlugin
LtsSession
BatGuiPluginInterface
Qt6::Widgets
${Qt6_Widgets}
LtsNotification
)
)
endif()
IF(WIN32)
NGL_TARGET_LINK_LIBRARIES(BatGuiPlugin
WLanApi.lib
qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Common/CMakeLists.txt
+25 -6
View File
@@ -6,6 +6,21 @@
# Created by Mike Wille, SLSE, 2017-08-17
#
# Make ${Qt6_Gui} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Gui)
set(Qt6_Gui ${Qt6_Gui})
else()
set(Qt6_Gui "")
endif()
# Make ${Qt6_Widgets} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
set(Qt6_Widgets ${Qt6_Widgets})
else()
set(Qt6_Widgets "")
endif()
FIND_PACKAGE(BgViewer)
IF (BgViewer_FOUND)
SET(BgViewer_FOUND TRUE)
@@ -94,7 +109,8 @@ INSTALL_SHARED_FILES(BuildingViewerCommon_SRCS
)
NGL_ADD_LIBRARY2(WS BuildingViewerCommon SHARED ${BuildingViewerCommon_SRCS})
NGL_TARGET_LINK_LIBRARIES(BuildingViewerCommon
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(BuildingViewerCommon
PRIVATE
Qt6::OpenGL
${OPENGL_LIBRARIES}
@@ -102,7 +118,8 @@ NGL_TARGET_LINK_LIBRARIES(BuildingViewerCommon
${BGVIEWER_DTENTITY_LIBRARY}
${OPENTHREADS_LIBRARIES} # FIND_PACKAGE(OpenSceneGraph)
${OPENSCENEGRAPH_LIBRARIES} # FIND_PACKAGE(OpenSceneGraph)
)
)
endif()
NGL_TARGET_INCLUDE_DIRECTORIES(BuildingViewerCommon
PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/BgViewer/dtEntity/ext/RapidXML
@@ -132,14 +149,15 @@ NGL_TARGET_INCLUDE_DIRECTORIES(BuildingViewerCommon
${CMAKE_CURRENT_BINARY_DIR}/../
)
NGL_TARGET_LINK_LIBRARIES(BuildingViewerCommon
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(BuildingViewerCommon
PRIVATE
ngltools
LtsPluginManager
PUBLIC
Qt6::Core
Qt6::Gui
Qt6::Widgets
${Qt6_Gui}
${Qt6_Widgets}
AsbDataPluginInterface
AvmDataPluginInterface
BldDataPluginInterface
@@ -156,6 +174,7 @@ NGL_TARGET_LINK_LIBRARIES(BuildingViewerCommon
LtsWidgets
LtsUtilsSettings
LtsUtilsGuiDds
)
)
endif()
NGL_INSTALL_TARGET(BuildingViewerCommon)
qt6-after/qt6-migrated-legatus/Lts/Plugins/BuildingViewer/Gui/BuildingViewer/CMakeLists.txt
+13 -3
View File
@@ -6,6 +6,14 @@
# Created by Mike Wille, SLSE, 2017-05-15
#
# Make ${Qt6_Widgets} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
set(Qt6_Widgets ${Qt6_Widgets})
else()
set(Qt6_Widgets "")
endif()
SET(SRCS
BuildingEdit/bdv_building_edit.cpp
BuildingEdit/bdv_building_edit.h
@@ -52,7 +60,8 @@ NGL_WRAP_UI(SRCS
NGL_ADD_LIBRARY(WS BdvViewerGuiPlugin MODULE ${SRCS})
NGL_TARGET_LINK_LIBRARIES(BdvViewerGuiPlugin
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(BdvViewerGuiPlugin
BdvViewerGuiPluginInterface
BldDataPluginInterface
BuildingViewerCommon
@@ -69,12 +78,13 @@ NGL_TARGET_LINK_LIBRARIES(BdvViewerGuiPlugin
NGLLogger
nglwidgets
Qt6::Core
Qt6::Widgets
${Qt6_Widgets}
Qt6::Xml
TopicEditorBase
LtsUtilsGuiDds
LtsUtilsSettings
ngltools
ExportBdvTopicSetting
)
)
endif()
NGL_INSTALL_TARGET(BdvViewerGuiPlugin)
qt6-after/qt6-migrated-legatus/Lts/Plugins/Buildings/Gui/BuildingInfo/CMakeLists.txt
+13 -3
View File
@@ -4,6 +4,14 @@
# $Author$
# Created by hjl, SLSE, 2017-04-05
#
# Make ${Qt6_Widgets} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
set(Qt6_Widgets ${Qt6_Widgets})
else()
set(Qt6_Widgets "")
endif()
SET(bld_info_gui_SRCS
info_dialog_base.cpp
info_dialog_base.h
@@ -46,7 +54,8 @@ NGL_WRAP_UI(bld_info_gui_SRCS
)
NGL_ADD_LIBRARY(WS BldInfoGuiPlugin MODULE ${bld_info_gui_SRCS})
NGL_TARGET_LINK_LIBRARIES(BldInfoGuiPlugin
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(BldInfoGuiPlugin
Qt6::Core
BldInfoGuiPluginInterface
BuildingViewerCommon
@@ -56,7 +65,7 @@ NGL_TARGET_LINK_LIBRARIES(BldInfoGuiPlugin
svcBldClient
svcAsmClient
svcBldCommon
Qt6::Widgets
${Qt6_Widgets}
Qt6::Network
LtsWidgets
LtsSession
@@ -72,6 +81,7 @@ NGL_TARGET_LINK_LIBRARIES(BldInfoGuiPlugin
LtsDataView
GuiPluginInterface
)
)
endif()
NGL_INSTALL_TARGET(BldInfoGuiPlugin)
qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantMove/CMakeLists.txt
+13 -3
View File
@@ -5,6 +5,14 @@
# Created by Hannes Baeuerle, SLSE, 2017-02-24
#
# Make ${Qt6_Widgets} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
set(Qt6_Widgets ${Qt6_Widgets})
else()
set(Qt6_Widgets "")
endif()
SET(ces_participant_move_gui_SRCS
logger.cpp
logger.h
@@ -24,7 +32,8 @@ NGL_WRAP_UI (ces_participant_move_gui_SRCS
)
NGL_ADD_LIBRARY(WS CesParticipantMoveGuiPlugin MODULE ${ces_participant_move_gui_SRCS})
NGL_TARGET_LINK_LIBRARIES(CesParticipantMoveGuiPlugin
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(CesParticipantMoveGuiPlugin
AsbDataPluginInterface
LtsCoordTrans
LtsPrinting
@@ -34,7 +43,7 @@ NGL_TARGET_LINK_LIBRARIES(CesParticipantMoveGuiPlugin
GuiPluginInterface
AsmGuiPluginInterface
ExmDataPluginInterface
Qt6::Widgets
${Qt6_Widgets}
PpmCommon
FlmDataPluginInterface
LtsUtilsGuiDds
@@ -46,6 +55,7 @@ NGL_TARGET_LINK_LIBRARIES(CesParticipantMoveGuiPlugin
LtsUtilsGuiDds
ltsCoordWidget
LtsUtilsSettings
)
)
endif()
NGL_INSTALL_TARGET(CesParticipantMoveGuiPlugin)
qt6-after/qt6-migrated-legatus/Lts/Plugins/CentralEffectSimulation/Gui/ParticipantUAS/CMakeLists.txt
+13 -3
View File
@@ -5,6 +5,14 @@
# Created by Hannes Baeuerle, SLSE, 2017-02-24
#
# Make ${Qt6_Widgets} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
set(Qt6_Widgets ${Qt6_Widgets})
else()
set(Qt6_Widgets "")
endif()
SET(ces_participant_uas_gui_SRCS
logger.cpp
logger.h
@@ -37,7 +45,8 @@ target_sources(CesParticipantUASGuiPlugin
)
endif()
NGL_TARGET_LINK_LIBRARIES(CesParticipantUASGuiPlugin
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(CesParticipantUASGuiPlugin
AsbDataPluginInterface
LtsCoordTrans
LtsPrinting
@@ -47,7 +56,7 @@ NGL_TARGET_LINK_LIBRARIES(CesParticipantUASGuiPlugin
GuiPluginInterface
AsmGuiPluginInterface
ExmDataPluginInterface
Qt6::Widgets
${Qt6_Widgets}
PpmCommon
FlmDataPluginInterface
LtsUtilsGuiDds
@@ -59,6 +68,7 @@ NGL_TARGET_LINK_LIBRARIES(CesParticipantUASGuiPlugin
LtsUtilsGuiDds
ltsCoordWidget
LtsUtilsSettings
)
)
endif()
NGL_INSTALL_TARGET(CesParticipantUASGuiPlugin)
qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Gui/CodificationData/CMakeLists.txt
+13 -3
View File
@@ -5,6 +5,14 @@
# Created by hjl, SLSE, 2016-12-01
#
# Make ${Qt6_Widgets} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
set(Qt6_Widgets ${Qt6_Widgets})
else()
set(Qt6_Widgets "")
endif()
FIND_PACKAGE(KDReports REQUIRED)
SET(cod_codification_data_gui_SRCS
@@ -45,7 +53,8 @@ NGL_WRAP_UI(cod_codification_data_gui_SRCS
)
NGL_ADD_LIBRARY(WS CodCodificationDataGuiPlugin MODULE ${cod_codification_data_gui_SRCS})
NGL_TARGET_LINK_LIBRARIES(CodCodificationDataGuiPlugin
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(CodCodificationDataGuiPlugin
LtsPrinting
NGLLogger
LtsSession
@@ -54,7 +63,7 @@ NGL_TARGET_LINK_LIBRARIES(CodCodificationDataGuiPlugin
CodGuiPluginInterface
CodDataPluginInterface
PpmDataPluginInterface
Qt6::Widgets
${Qt6_Widgets}
KDReports::KDReports
LtsWidgets
LtsDataView
@@ -62,6 +71,7 @@ NGL_TARGET_LINK_LIBRARIES(CodCodificationDataGuiPlugin
FlmDataPluginInterface
ngltools
LtsUtilsSettings
)
)
endif()
NGL_INSTALL_TARGET(CodCodificationDataGuiPlugin)
qt6-after/qt6-migrated-legatus/Lts/Plugins/CodificationManagement/Test/CMakeLists.txt
+13 -3
View File
@@ -1,6 +1,14 @@
# Make ${Qt6_Widgets} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
set(Qt6_Widgets ${Qt6_Widgets})
else()
set(Qt6_Widgets "")
endif()
SET(lt_SRCS
main.cpp
maindialog.h
@@ -15,12 +23,14 @@ NGL_WRAP_UI(lt_SRCS ui/maindialog.ui)
NGL_ADD_EXECUTABLE(WS CODTest ${lt_SRCS})
NGL_TARGET_LINK_LIBRARIES(CODTest
Qt6::Widgets
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(CODTest
${Qt6_Widgets}
Qt6::Core
nglapplication
NGLLogger
)
)
endif()
NGL_INSTALL_TARGET_DEVEL(CODTest)
NGL_INSTALL(WS FILES log4cxx_cod_test.props DESTINATION bin COMPONENT Devel)
qt6-after/qt6-migrated-legatus/Lts/Plugins/CollateralDamageSimulation/Gui/CreateSimulation/CMakeLists.txt
+16 -6
View File
@@ -5,10 +5,18 @@
# Created by Hannes Fritsche, ESZS, 2024-08-05
#
FIND_PACKAGE(KDReports)
# Make ${Qt6_Widgets} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
set(Qt6_Widgets ${Qt6_Widgets})
else()
set(Qt6_Widgets "")
endif()
IF(NOT KDReports_FOUND)
MESSAGE(STATUS "KDReports not found; skipping CdsSimulationGuiPlugin")
find_package(KDReports QUIET)
IF(NOT KDReports_FOUND OR NOT QT6_GUI_AVAILABLE)
MESSAGE(STATUS "KDReports not found or Qt6 GUI not available; skipping CdsSimulationGuiPlugin")
RETURN()
ENDIF()
@@ -37,7 +45,8 @@ NGL_WRAP_UI(cds_gui_SRCS
)
NGL_ADD_LIBRARY(WS CdsSimulationGuiPlugin MODULE ${cds_gui_SRCS})
NGL_TARGET_LINK_LIBRARIES(CdsSimulationGuiPlugin
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(CdsSimulationGuiPlugin
CdsGuiPluginInterface
IsmDataPluginInterface
FlmDataPluginInterface
@@ -51,11 +60,12 @@ NGL_TARGET_LINK_LIBRARIES(CdsSimulationGuiPlugin
ngltools
PdmDataPluginInterface
PpmDataPluginInterface
Qt6::Widgets
${Qt6_Widgets}
situationMap
situationMapGeometryModel
SituationMapGuiPluginInterface
svcAesCommon
)
)
endif()
NGL_INSTALL_TARGET(CdsSimulationGuiPlugin)
qt6-after/qt6-migrated-legatus/Lts/Plugins/DeveloperTools/Gui/CMakeLists.txt
+13 -3
View File
@@ -6,6 +6,14 @@
# Created by Mike Wille, SLSE, 2017-11-15
#
# Make ${Qt6_Widgets} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
set(Qt6_Widgets ${Qt6_Widgets})
else()
set(Qt6_Widgets "")
endif()
SET(dev_gui_SRCS
dev_gui_plugin.cpp
dev_gui_plugin.h
@@ -31,8 +39,9 @@ NGL_WRAP_UI(dev_gui_SRCS
)
NGL_ADD_LIBRARY2(WS NO_TRANSLATION DevGuiPlugin SHARED ${dev_gui_SRCS})
NGL_TARGET_LINK_LIBRARIES(DevGuiPlugin
Qt6::Widgets
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(DevGuiPlugin
${Qt6_Widgets}
Qt6::Network
ngltranslator
LtsWidgets
@@ -52,7 +61,8 @@ NGL_TARGET_LINK_LIBRARIES(DevGuiPlugin
# ftcmock:
#ExmDataPluginInterface
svcExmClient
)
)
endif()
NGL_INSTALL_TARGET(DevGuiPlugin)
qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectManagement/Gui/SoundArea/CMakeLists.txt
+13 -3
View File
@@ -5,6 +5,14 @@
# Created by Filip Biedziak, NLE, 2020-08-14
#
# Make ${Qt6_Widgets} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
set(Qt6_Widgets ${Qt6_Widgets})
else()
set(Qt6_Widgets "")
endif()
SET(efm_sound_area_gui_SRCS
efm_sound_area_gui_plugin.cpp
efm_sound_area_gui_plugin.h
@@ -43,14 +51,16 @@ NGL_WRAP_UI(efm_sound_area_gui_SRCS
)
NGL_ADD_LIBRARY(WS EfmSoundAreaGuiPlugin MODULE ${efm_sound_area_gui_SRCS})
NGL_TARGET_LINK_LIBRARIES(EfmSoundAreaGuiPlugin
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(EfmSoundAreaGuiPlugin
ngltools
LtsSession
LtsWidgets
IsmDataPluginInterface
EfmDataPluginInterface
EfmGuiPluginInterface
Qt6::Widgets
${Qt6_Widgets}
LtsUtilsGuiDds
)
)
endif()
NGL_INSTALL_TARGET(EfmSoundAreaGuiPlugin)
qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowClient/Gui/CMakeLists.txt
+13 -3
View File
@@ -5,6 +5,14 @@
# Created by Patric Karwat, SLSE, 2016-10-05
#
# Make ${Qt6_Widgets} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
set(Qt6_Widgets ${Qt6_Widgets})
else()
set(Qt6_Widgets "")
endif()
SET(esc_effect_show_gui_SRCS
esc_effect_show_gui_plugin.cpp
esc_effect_show_gui_plugin.h
@@ -37,7 +45,8 @@ NGL_WRAP_UI(esc_effect_show_gui_SRCS
)
NGL_ADD_LIBRARY(WS EscEffectShowGuiPlugin MODULE ${esc_effect_show_gui_SRCS})
NGL_TARGET_LINK_LIBRARIES(EscEffectShowGuiPlugin
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(EscEffectShowGuiPlugin
NGLLogger
ngltools
LtsPrinting
@@ -46,13 +55,14 @@ NGL_TARGET_LINK_LIBRARIES(EscEffectShowGuiPlugin
EscDataPluginInterface
SituationMapGuiPluginInterface
TabocDataPluginInterface
Qt6::Widgets
${Qt6_Widgets}
LtsWidgets
LtsDataView
LtsNotification
LtsUtilsGuiDds
LtsCoordTrans
ltsCoordWidget
)
)
endif()
NGL_INSTALL_TARGET(EscEffectShowGuiPlugin)
qt6-after/qt6-migrated-legatus/Lts/Plugins/EffectShowManagement/Gui/CMakeLists.txt
+13 -3
View File
@@ -5,6 +5,14 @@
# Created by Patric Karwat, SLSE, 2016-10-05
#
# Make ${Qt6_Widgets} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
set(Qt6_Widgets ${Qt6_Widgets})
else()
set(Qt6_Widgets "")
endif()
SET(esm_effect_show_gui_SRCS
esm_effect_show_gui_plugin.cpp
esm_effect_show_gui_plugin.h
@@ -36,14 +44,15 @@ NGL_WRAP_UI(esm_effect_show_gui_SRCS
)
NGL_ADD_LIBRARY(WS EsmEffectShowGuiPlugin MODULE ${esm_effect_show_gui_SRCS})
NGL_TARGET_LINK_LIBRARIES(EsmEffectShowGuiPlugin
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(EsmEffectShowGuiPlugin
NGLLogger
ngltools
LtsPrinting
LtsSession
EsmGuiPluginInterface
EsmDataPluginInterface
Qt6::Widgets
${Qt6_Widgets}
LtsWidgets
LtsDataView
LtsUtilsGuiDds
@@ -55,7 +64,8 @@ NGL_TARGET_LINK_LIBRARIES(EsmEffectShowGuiPlugin
TabDataPluginInterface
PpmCommon
LtsUtilsSettings
)
)
endif()
NGL_INSTALL_TARGET(EsmEffectShowGuiPlugin)
qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/CMakeLists.txt
+12 -2
View File
@@ -5,6 +5,14 @@
#
# Created by Mike Wille, SLSE, 2017-03-15
#
# Make ${Qt6_Widgets} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
set(Qt6_Widgets ${Qt6_Widgets})
else()
set(Qt6_Widgets "")
endif()
ADD_SUBDIRECTORY(SanNineLinerEdit)
SET(evl_edit_gui_SRCS
@@ -62,7 +70,8 @@ NGL_WRAP_UI(evl_edit_gui_SRCS
NGL_ADD_LIBRARY(WS EvlEditGuiPlugin MODULE ${evl_edit_gui_SRCS})
NGL_TARGET_LINK_LIBRARIES(EvlEditGuiPlugin
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(EvlEditGuiPlugin
LtsPrinting
NGLLogger
LtsSession
@@ -75,7 +84,7 @@ NGL_TARGET_LINK_LIBRARIES(EvlEditGuiPlugin
OscDataPluginInterface
svcEvlCommon
Qt6::Widgets
${Qt6_Widgets}
LtsWidgets
LtsDataView
LtsUtilsGuiDds
@@ -91,5 +100,6 @@ NGL_TARGET_LINK_LIBRARIES(EvlEditGuiPlugin
LtsScriptTimeline # TopicEditor
LtsUtilsSettings
)
endif()
NGL_INSTALL_TARGET(EvlEditGuiPlugin)
qt6-after/qt6-migrated-legatus/Lts/Plugins/Evaluations/Gui/SanNineLinerEdit/CMakeLists.txt
+13 -3
View File
@@ -5,6 +5,14 @@
# Created by Christian Ehrlicher, SLSE, 2016-02-29
#
# Make ${Qt6_Widgets} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
set(Qt6_Widgets ${Qt6_Widgets})
else()
set(Qt6_Widgets "")
endif()
SET(san_edit_gui_SRCS
san_nine_liner_edit_gui_plugin.cpp
san_nine_liner_edit_gui_plugin.h
@@ -22,7 +30,8 @@ NGL_WRAP_UI(san_edit_gui_SRCS
)
NGL_ADD_LIBRARY(WS EvlSanNineLinerEditGuiPlugin MODULE ${san_edit_gui_SRCS})
NGL_TARGET_LINK_LIBRARIES(EvlSanNineLinerEditGuiPlugin
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(EvlSanNineLinerEditGuiPlugin
ngltools # dtg
ngltranslator
NGLLogger
@@ -31,7 +40,7 @@ NGL_TARGET_LINK_LIBRARIES(EvlSanNineLinerEditGuiPlugin
EvlGuiPluginInterface
svcEvlCommon
Qt6::Widgets
${Qt6_Widgets}
LtsCoordTrans
ltsCoordWidget
LtsWidgets
@@ -41,7 +50,8 @@ NGL_TARGET_LINK_LIBRARIES(EvlSanNineLinerEditGuiPlugin
LtsSessionData
ProjectConfig
LtsUtilsGuiConnectDialog
)
)
endif()
NGL_INSTALL_TARGET(EvlSanNineLinerEditGuiPlugin)
qt6-after/qt6-migrated-legatus/Lts/Plugins/ExerciseManagement/Gui/ExerciseEdit/CMakeLists.txt
+13 -3
View File
@@ -5,6 +5,14 @@
# Created by Christian Ehrlicher, SLSE, 2016-02-29
#
# Make ${Qt6_Widgets} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
set(Qt6_Widgets ${Qt6_Widgets})
else()
set(Qt6_Widgets "")
endif()
SET(exm_edit_gui_SRCS
exm_edit_gui_plugin.cpp
exm_edit_gui_plugin.h
@@ -54,7 +62,8 @@ NGL_WRAP_UI(exm_edit_gui_SRCS
)
NGL_ADD_LIBRARY(WS ExmEditGuiPlugin MODULE ${exm_edit_gui_SRCS})
NGL_TARGET_LINK_LIBRARIES(ExmEditGuiPlugin
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(ExmEditGuiPlugin
ngltools # dtg
NGLLogger
LtsSession
@@ -66,7 +75,7 @@ NGL_TARGET_LINK_LIBRARIES(ExmEditGuiPlugin
OpmDataPluginInterface
ExmGuiPluginInterface
FlmDataPluginInterface
Qt6::Widgets
${Qt6_Widgets}
LtsCoordTrans
LtsWidgets
LtsDataView
@@ -75,7 +84,8 @@ NGL_TARGET_LINK_LIBRARIES(ExmEditGuiPlugin
LtsSessionData
ProjectConfig
LtsUtilsGuiConnectDialog
)
)
endif()
NGL_INSTALL_TARGET(ExmEditGuiPlugin)
qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/Explorer/CMakeLists.txt
+13 -3
View File
@@ -6,6 +6,14 @@
# Created by Mike Wille, SLSE, 2017-03-31
#
# Make ${Qt6_Widgets} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
set(Qt6_Widgets ${Qt6_Widgets})
else()
set(Qt6_Widgets "")
endif()
INCLUDE(MacroCodeGenIdl)
SET(flm_explorer_gui_SRCS
@@ -52,14 +60,15 @@ INSTALL_SHARED_FILES(flm_explorer_gui_SRCS
NGL_ADD_LIBRARY(WS FlmExplorerGuiPlugin MODULE ${flm_explorer_gui_SRCS})
NGL_TARGET_LINK_LIBRARIES(FlmExplorerGuiPlugin
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(FlmExplorerGuiPlugin
NGLLogger
FlmExplorerGuiPluginInterface
FlmDataPluginInterface
OpmDataPluginInterface
ExmDataPluginInterface
PpmDataPluginInterface
Qt6::Widgets
${Qt6_Widgets}
LtsDataView
LtsUtilsGuiDds
LtsUtilsGuiConnectDialog
@@ -79,6 +88,7 @@ NGL_TARGET_LINK_LIBRARIES(FlmExplorerGuiPlugin
situationMapGeometryModel
advancedSymbology
svcAesCommon
)
)
endif()
NGL_INSTALL_TARGET(FlmExplorerGuiPlugin)
qt6-after/qt6-migrated-legatus/Lts/Plugins/FileManagement/Gui/FlmComboBox/CMakeLists.txt
+13 -3
View File
@@ -5,6 +5,14 @@
# Created by Mike Wille, SLSE, 2016-05-05
#
# Make ${Qt6_Widgets} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
set(Qt6_Widgets ${Qt6_Widgets})
else()
set(Qt6_Widgets "")
endif()
SET(flm_combobox_gui_SRCS
flm_combobox_gui_plugin.cpp
flm_combobox_gui_plugin.h
@@ -16,14 +24,16 @@ NGL_WRAP_UI(flm_combobox_gui_SRCS
)
NGL_ADD_LIBRARY(WS FlmComboBoxGuiPlugin MODULE ${flm_combobox_gui_SRCS})
NGL_TARGET_LINK_LIBRARIES(FlmComboBoxGuiPlugin
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(FlmComboBoxGuiPlugin
NGLLogger
FlmGuiComboboxPluginInterface
FlmDataPluginInterface
Qt6::Widgets
${Qt6_Widgets}
LtsWidgets
LtsSession
)
)
endif()
NGL_INSTALL_TARGET(FlmComboBoxGuiPlugin)
qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/CMakeLists.txt
+18 -6
View File
@@ -5,6 +5,14 @@
# Created by Christian Ehrlicher, SLSE, 2017-06-16
#
# Make ${Qt6_Widgets} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
set(Qt6_Widgets ${Qt6_Widgets})
else()
set(Qt6_Widgets "")
endif()
ADD_SUBDIRECTORY(Common)
SET(flt_aes_widget_SRCS
@@ -17,7 +25,8 @@ NGL_WRAP_UI(flt_aes_widget_SRCS
)
NGL_ADD_LIBRARY(WS FltAesWidget STATIC ${flt_aes_widget_SRCS})
NGL_TARGET_LINK_LIBRARIES(FltAesWidget
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(FltAesWidget
PRIVATE
svcFltCommon
LtsProjectionWorkstation
@@ -26,8 +35,9 @@ NGL_TARGET_LINK_LIBRARIES(FltAesWidget
LtsSessionData
PdmGuiPluginInterface
PpmGuiComboboxPluginInterface
Qt6::Widgets
)
${Qt6_Widgets}
)
endif()
NGL_TARGET_INCLUDE_DIRECTORIES(FltAesWidget
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../../..
@@ -41,7 +51,8 @@ SET(flt_aes_gui_SRCS
)
NGL_ADD_LIBRARY(WS FltAesGuiPlugin MODULE ${flt_aes_gui_SRCS})
NGL_TARGET_LINK_LIBRARIES(FltAesGuiPlugin
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(FltAesGuiPlugin
FltAesGuiCommon
FltAesGuiPluginInterface
FltAesWidget
@@ -52,7 +63,8 @@ NGL_TARGET_LINK_LIBRARIES(FltAesGuiPlugin
LtsUtilsGuiDds
LtsUtilsSettings
LtsWidgets
Qt6::Widgets
)
${Qt6_Widgets}
)
endif()
NGL_INSTALL_TARGET(FltAesGuiPlugin)
qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Aes/Common/CMakeLists.txt
+13 -3
View File
@@ -6,6 +6,14 @@
# Created by Mike Wille, SLSE, 2017-11-27
#
# Make ${Qt6_Widgets} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
set(Qt6_Widgets ${Qt6_Widgets})
else()
set(Qt6_Widgets "")
endif()
SET(flt_aes_gui_common_SRCS
common.h
aes_display_filter_impl.h
@@ -21,15 +29,17 @@ NGL_TARGET_INCLUDE_DIRECTORIES(FltAesGuiCommon
PUBLIC
${CMAKE_BINARY_DIR}
)
NGL_TARGET_LINK_LIBRARIES(FltAesGuiCommon
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(FltAesGuiCommon
PRIVATE
svcPpmCommon
PUBLIC
FltDataPluginInterface
Qt6::Core
Qt6::Widgets # ifdef LTS_DEBUG QMessageBox
${Qt6_Widgets} # ifdef LTS_DEBUG QMessageBox
svcFltCommon
svcAesCommon
)
)
endif()
NGL_INSTALL_TARGET(FltAesGuiCommon)
qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/BuildingComponents/CMakeLists.txt
+18 -6
View File
@@ -5,6 +5,14 @@
# Created by Christian Ehrlicher, SLSE, 2017-06-16
#
# Make ${Qt6_Widgets} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
set(Qt6_Widgets ${Qt6_Widgets})
else()
set(Qt6_Widgets "")
endif()
SET(flt_bldg_cmpnt_widget_SRCS
flt_building_component_settings_widget.cpp
flt_building_component_settings_widget.h
@@ -15,7 +23,8 @@ NGL_WRAP_UI(flt_bldg_cmpnt_widget_SRCS
)
NGL_ADD_LIBRARY(WS FltBldgCmpntWidget STATIC ${flt_bldg_cmpnt_widget_SRCS})
NGL_TARGET_LINK_LIBRARIES(FltBldgCmpntWidget
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(FltBldgCmpntWidget
PRIVATE
svcFltCommon
IsmDataPluginInterface
@@ -25,8 +34,9 @@ NGL_TARGET_LINK_LIBRARIES(FltBldgCmpntWidget
LtsSessionData
PdmGuiPluginInterface
PpmGuiComboboxPluginInterface
Qt6::Widgets
)
${Qt6_Widgets}
)
endif()
NGL_TARGET_INCLUDE_DIRECTORIES(FltBldgCmpntWidget
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../../..
@@ -41,7 +51,8 @@ SET(flt_bldg_cmpnt_gui_SRCS
)
NGL_ADD_LIBRARY(WS Fltbldg_cmpntGuiPlugin MODULE ${flt_bldg_cmpnt_gui_SRCS})
NGL_TARGET_LINK_LIBRARIES(Fltbldg_cmpntGuiPlugin
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(Fltbldg_cmpntGuiPlugin
FltAesGuiCommon
FltBldgCmpntGuiPluginInterface
FltBldgCmpntWidget
@@ -52,7 +63,8 @@ NGL_TARGET_LINK_LIBRARIES(Fltbldg_cmpntGuiPlugin
LtsUtilsGuiDds
LtsUtilsSettings
LtsWidgets
Qt6::Widgets
)
${Qt6_Widgets}
)
endif()
NGL_INSTALL_TARGET(Fltbldg_cmpntGuiPlugin)
qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/FilterChange/CMakeLists.txt
+13 -3
View File
@@ -6,6 +6,14 @@
# Created by Norbert Thoden, NLE, 2019-02-25
#
# Make ${Qt6_Widgets} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
set(Qt6_Widgets ${Qt6_Widgets})
else()
set(Qt6_Widgets "")
endif()
SET(flt_filter_change_SRCS
flt_filter_change.cpp
flt_filter_change.h
@@ -21,7 +29,8 @@ NGL_TARGET_INCLUDE_DIRECTORIES(FltFilterChange
${CMAKE_CURRENT_SOURCE_DIR}/../
${CMAKE_CURRENT_BINARY_DIR}/../
)
NGL_TARGET_LINK_LIBRARIES(FltFilterChange
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(FltFilterChange
PRIVATE
LtsSession
LtsSessionData
@@ -36,7 +45,8 @@ NGL_TARGET_LINK_LIBRARIES(FltFilterChange
FltBldgCmpntGuiPluginInterface
OpmGuiPluginInterface
Qt6::Core
Qt6::Widgets
)
${Qt6_Widgets}
)
endif()
NGL_INSTALL_TARGET(FltFilterChange)
qt6-after/qt6-migrated-legatus/Lts/Plugins/FilterManagement/Gui/Participant/CMakeLists.txt
+18 -6
View File
@@ -4,6 +4,14 @@
# Created by Christian Ehrlicher, SLSE, 2017-06-16
#
# Make ${Qt6_Widgets} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
set(Qt6_Widgets ${Qt6_Widgets})
else()
set(Qt6_Widgets "")
endif()
SET(flt_part_widget_SRCS
flt_collapse_expand_participants_widget.cpp
flt_collapse_expand_participants_widget.h
@@ -19,7 +27,8 @@ NGL_WRAP_UI(flt_part_widget_SRCS
flt_type_filter_widget.ui
)
NGL_ADD_LIBRARY(WS FltParticipantWidget STATIC ${flt_part_widget_SRCS})
NGL_TARGET_LINK_LIBRARIES(FltParticipantWidget
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(FltParticipantWidget
PRIVATE
svcFltCommon
PpmCommon
@@ -29,8 +38,9 @@ NGL_TARGET_LINK_LIBRARIES(FltParticipantWidget
FltDataPluginInterface
PdmGuiPluginInterface
PpmGuiComboboxPluginInterface
Qt6::Widgets
)
${Qt6_Widgets}
)
endif()
NGL_TARGET_INCLUDE_DIRECTORIES(FltParticipantWidget
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../../..
@@ -50,7 +60,8 @@ SET(flt_part_gui_SRCS
NGL_ADD_LIBRARY(WS FltParticipantGuiPlugin MODULE ${flt_part_gui_SRCS})
NGL_TARGET_LINK_LIBRARIES(FltParticipantGuiPlugin
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(FltParticipantGuiPlugin
AsbDataPluginInterface
LtsPrinting
FltFilterChange
@@ -69,7 +80,8 @@ NGL_TARGET_LINK_LIBRARIES(FltParticipantGuiPlugin
LtsUtilsGuiDds
LtsUtilsSettings
LtsWidgets
Qt6::Widgets
)
${Qt6_Widgets}
)
endif()
NGL_INSTALL_TARGET(FltParticipantGuiPlugin)
qt6-after/qt6-migrated-legatus/Lts/Plugins/FreeSpace/Gui/CMakeLists.txt
+13 -3
View File
@@ -5,20 +5,30 @@
# Created by Mike Wille, SLTE, 2020-11-22
#
# Make ${Qt6_Widgets} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
set(Qt6_Widgets ${Qt6_Widgets})
else()
set(Qt6_Widgets "")
endif()
SET(fsp_gui_SRCS
fsp_gui_plugin.cpp
fsp_gui_plugin.h
)
NGL_ADD_LIBRARY(WS FspGuiPlugin MODULE ${fsp_gui_SRCS})
NGL_TARGET_LINK_LIBRARIES(FspGuiPlugin
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(FspGuiPlugin
LtsSession
LtsSessionData
FspGuiPluginInterface
Qt6::Widgets
${Qt6_Widgets}
LtsNotification
svcAsmCommon
)
)
endif()
NGL_INSTALL_TARGET(FspGuiPlugin)
qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezIedManagement/Gui/InfoDialog/CMakeLists.txt
+13 -3
View File
@@ -6,6 +6,14 @@
# Created by Dassow Philipp, SLEA, 2017-08-22
#
# Make ${Qt6_Widgets} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
set(Qt6_Widgets ${Qt6_Widgets})
else()
set(Qt6_Widgets "")
endif()
SET (gim_info_gui_SRCS
gim_info_gui_plugin.h
gim_info_gui_plugin.cpp
@@ -18,7 +26,8 @@ QT5_WRAP_UI(gim_info_gui_SRCS
)
NGL_ADD_LIBRARY(WS GimInfoGuiPlugin MODULE ${gim_info_gui_SRCS})
NGL_TARGET_LINK_LIBRARIES(GimInfoGuiPlugin
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(GimInfoGuiPlugin
PRIVATE
svcGimCommon
PUBLIC
@@ -30,7 +39,8 @@ NGL_TARGET_LINK_LIBRARIES(GimInfoGuiPlugin
AsbDataPluginInterface
PpmDataPluginInterface
SituationMapGuiPluginInterface
Qt6::Widgets
)
${Qt6_Widgets}
)
endif()
NGL_INSTALL_TARGET(GimInfoGuiPlugin)
qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezIedManagement/Gui/PairingEdit/CMakeLists.txt
+13 -3
View File
@@ -6,6 +6,14 @@
# Created by Dassow Philipp, SLEA, 2017-07-28
#
# Make ${Qt6_Widgets} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
set(Qt6_Widgets ${Qt6_Widgets})
else()
set(Qt6_Widgets "")
endif()
SET (gim_pairing_gui_SRCS
gim_pairing_gui_plugin.h
gim_pairing_gui_plugin.cpp
@@ -18,7 +26,8 @@ QT5_WRAP_UI(gim_pairing_gui_SRCS
)
NGL_ADD_LIBRARY(WS GimPairingGuiPlugin MODULE ${gim_pairing_gui_SRCS})
NGL_TARGET_LINK_LIBRARIES(GimPairingGuiPlugin
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(GimPairingGuiPlugin
PRIVATE
LtsPrinting
svcGimCommon
@@ -32,7 +41,8 @@ NGL_TARGET_LINK_LIBRARIES(GimPairingGuiPlugin
PpmDataPluginInterface
PpmGuiComboboxPluginInterface
PpmCommon
Qt6::Widgets
)
${Qt6_Widgets}
)
endif()
NGL_INSTALL_TARGET(GimPairingGuiPlugin)
qt6-after/qt6-migrated-legatus/Lts/Plugins/GuezNasat/Gui/AssignNasat/CMakeLists.txt
+13 -3
View File
@@ -5,6 +5,14 @@
# Created by Patric Karwat, SLSE, 2016-10-05
#
# Make ${Qt6_Widgets} optional
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
set(Qt6_Widgets ${Qt6_Widgets})
else()
set(Qt6_Widgets "")
endif()
SET(gna_nasat_part_gui_SRCS
gna_nasat_part_gui_plugin.cpp
gna_nasat_part_gui_plugin.h
@@ -20,7 +28,8 @@ NGL_WRAP_UI(gna_nasat_part_gui_SRCS
)
NGL_ADD_LIBRARY(WS GnaNasatPartGuiPlugin MODULE ${gna_nasat_part_gui_SRCS})
NGL_TARGET_LINK_LIBRARIES(GnaNasatPartGuiPlugin
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(GnaNasatPartGuiPlugin
LtsPrinting
GnaCommon
LtsSession
@@ -30,13 +39,14 @@ NGL_TARGET_LINK_LIBRARIES(GnaNasatPartGuiPlugin
svcGnaCommon
svcPpmCommon
GuiPluginInterface
Qt6::Widgets
${Qt6_Widgets}
LtsCoordTrans
LtsWidgets
LtsDataView
NGLLogger
LtsUtilsGuiDds
LtsUtilsSettings
)
)
endif()
NGL_INSTALL_TARGET(GnaNasatPartGuiPlugin)
Loaded 100 of 829 files, more files were not shown because too many files have changed in this diff. Show more