Adds latest migration results

This commit is contained in:
torsten committed 2026-09-01 12:27:57 +02:00
1 parent ad07345480
commit 0c1503d85c
829 files changed
+31833 -67645

No files matched your search

+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_AUTOMOC TRUE)
SET(CMAKE_AUTOUIC TRUE) SET(CMAKE_AUTOUIC TRUE)
SET(QT_USE_IMPORTED_TARGETS 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. # 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 # Try to find Qt6 with GUI components first
find_package(Qt6 6.8 COMPONENTS Concurrent Core Core5Compat Gui LinguistTools Network OpenGL PrintSupport set(QT6_GUI_AVAILABLE FALSE)
Multimedia Sql Svg SerialPort Test UiTools WebSockets WebEngineCore WebEngineWidgets set(QT6_FOUND FALSE)
Widgets Xml Positioning REQUIRED) set(QT6_CORE5COMPAT_AVAILABLE FALSE)
find_package(Qt6 COMPONENTS Location Sensors XmlPatterns OPTIONAL)
if(Qt6_FOUND) # First check if Core5Compat is available
message(STATUS "Found Qt6: ${Qt6Core_VERSION}") find_package(Qt6 6.2 COMPONENTS Core5Compat QUIET)
# Map version variable for compatibility if available if(Qt6Core5Compat_FOUND)
if(Qt6Core_VERSION) set(QT6_CORE5COMPAT_AVAILABLE TRUE)
set(Qt5Core_VERSION ${Qt6Core_VERSION} CACHE INTERNAL "Compatibility Qt5Core_VERSION mapped from Qt6") message(STATUS "Found Qt6Core5Compat")
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}")
endif() 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 # 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 # 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 # 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 # 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) ADD_LIBRARY(ddsc ALIAS RTI::nddsc)
# ddscore wird von Lts/DDS/Core/CMakeLists.txt als echtes Target erstellt - kein Alias hier! # ddscore wird von Lts/DDS/Core/CMakeLists.txt als echtes Target erstellt - kein Alias hier!
ADD_LIBRARY(ddscpp2 ALIAS RTI::nddscpp2) ADD_LIBRARY(ddscpp2 ALIAS RTI::nddscpp2)
# Optionale Targets nur als ALIAS erstellen wenn verfügbar (RTI 7.x hat nicht alle Legacy-Bibliotheken) # 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) IF(TARGET RTI::nddscpp)
ADD_LIBRARY(ddscpp ALIAS RTI::nddscpp) ADD_LIBRARY(ddscpp ALIAS RTI::nddscpp)
ENDIF() ENDIF()
IF(TARGET RTI::nddsctesthelpers) IF(TARGET RTI::nddsctesthelpers)
ADD_LIBRARY(nddsctesthelpers ALIAS RTI::nddsctesthelpers) ADD_LIBRARY(nddsctesthelpers ALIAS RTI::nddsctesthelpers)
ENDIF() ENDIF()
ENDIF()
# HINWEIS: ddsftc, ddsfts, ddsconnector werden von Lts/DDS/FTC Modulen als INTERFACE Targets erstellt # HINWEIS: ddsftc, ddsfts, ddsconnector werden von Lts/DDS/FTC Modulen als INTERFACE Targets erstellt
# Hier KEINE ALIAS erstellen um Target-Kollisionen zu vermeiden # Hier KEINE ALIAS erstellen um Target-Kollisionen zu vermeiden
ELSE() ELSE()
@@ -330,7 +468,7 @@ ELSE()
ADD_LIBRARY(nddsctesthelpers INTERFACE) ADD_LIBRARY(nddsctesthelpers INTERFACE)
# HINWEIS: ddsftc, ddsfts, ddsconnector werden von Lts/DDS/FTC Modulen als INTERFACE Targets erstellt # HINWEIS: ddsftc, ddsfts, ddsconnector werden von Lts/DDS/FTC Modulen als INTERFACE Targets erstellt
# Hier KEINE Platzhalter erstellen um Target-Kollisionen zu vermeiden # 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_USE_QSTRINGBUILDER)
ADD_DEFINITIONS(-DQT_NO_CAST_TO_ASCII) ADD_DEFINITIONS(-DQT_NO_CAST_TO_ASCII)
@@ -5,6 +5,14 @@
# Created by Hanna Rathje, SLSE, 2017-12-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 SET(SRCS
aar_application.cpp aar_application.cpp
aar_application.h aar_application.h
@@ -19,8 +27,9 @@ NGL_WRAP_UI(SRCS aarApp.ui)
NGL_ADD_EXECUTABLE(AAR aarApp ${SRCS}) NGL_ADD_EXECUTABLE(AAR aarApp ${SRCS})
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(aarApp NGL_TARGET_LINK_LIBRARIES(aarApp
Qt6::Widgets ${Qt6_Widgets}
Qt6::Core Qt6::Core
nglapplication nglapplication
ngldb ngldb
@@ -31,6 +40,7 @@ NGL_TARGET_LINK_LIBRARIES(aarApp
NGLLogger NGLLogger
LtsCommandLineParser LtsCommandLineParser
) )
endif()
NGL_INSTALL_TARGET(aarApp) NGL_INSTALL_TARGET(aarApp)
NGL_INSTALL(AAR FILES log4cxx_aarApp.props DESTINATION bin) NGL_INSTALL(AAR FILES log4cxx_aarApp.props DESTINATION bin)
@@ -4,6 +4,14 @@
# $Author$ # $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(LOG4CXX_PROPS_FILE log4cxx_opapp.props)
SET(mwt_SRCS SET(mwt_SRCS
@@ -28,9 +36,10 @@ ELSE()
NGL_ADD_EXECUTABLE(WS OperatorApplication ${mwt_SRCS}) NGL_ADD_EXECUTABLE(WS OperatorApplication ${mwt_SRCS})
ENDIF() ENDIF()
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(OperatorApplication NGL_TARGET_LINK_LIBRARIES(OperatorApplication
ArcGISQt5Hack # make sure it's loaded *before* libEsriCommonQt.so ArcGISQt5Hack # make sure it's loaded *before* libEsriCommonQt.so
Qt6::Widgets ${Qt6_Widgets}
Qt6::Network Qt6::Network
nglapplication nglapplication
LtsCommandLineParser LtsCommandLineParser
@@ -48,6 +57,7 @@ NGL_TARGET_LINK_LIBRARIES(OperatorApplication
LtsUtilsGuiConnectDialog # to set timeout if -v is set LtsUtilsGuiConnectDialog # to set timeout if -v is set
LtsUtilsGuiStyleManager LtsUtilsGuiStyleManager
) )
endif()
NGL_INSTALL_TARGET(OperatorApplication) NGL_INSTALL_TARGET(OperatorApplication)
NGL_INSTALL(FILES WS ${LOG4CXX_PROPS_FILE} DESTINATION "bin") NGL_INSTALL(FILES WS ${LOG4CXX_PROPS_FILE} DESTINATION "bin")
@@ -1,6 +1,21 @@
# #
# THP-Viewer # 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) ADD_SUBDIRECTORY(THP-Starter)
# Make VLC optional - only try to find it if user explicitly enables it # Make VLC optional - only try to find it if user explicitly enables it
@@ -91,16 +106,17 @@ NGL_TARGET_COMPILE_DEFINITIONS(thp_viewer
PRIVATE PRIVATE
) )
ENDIF() ENDIF()
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(thp_viewer NGL_TARGET_LINK_LIBRARIES(thp_viewer
ArcGISQt5Hack # make sure it's loaded *before* libEsriCommonQt.so ArcGISQt5Hack # make sure it's loaded *before* libEsriCommonQt.so
Qt6::Core Qt6::Core
Qt6::Gui ${Qt6_Gui}
Qt6::PrintSupport Qt6::PrintSupport
Qt6::Svg Qt6::Svg
Qt6::WebEngineCore Qt6::WebEngineCore
Qt6::WebEngineWidgets Qt6::WebEngineWidgets
Qt6::Widgets ${Qt6_Widgets}
Qt6::Xml Qt6::Xml
RmeLightStyleQrc RmeLightStyleQrc
@@ -136,6 +152,7 @@ NGL_TARGET_LINK_LIBRARIES(thp_viewer
svcPdmClient svcPdmClient
svcAlmClient svcAlmClient
) )
endif()
IF(VLC_FOUND) IF(VLC_FOUND)
NGL_TARGET_LINK_LIBRARIES(thp_viewer NGL_TARGET_LINK_LIBRARIES(thp_viewer
$<$<TARGET_EXISTS:PkgConfig::VLC>:PkgConfig::VLC> $<$<TARGET_EXISTS:PkgConfig::VLC>:PkgConfig::VLC>
@@ -4,6 +4,14 @@
# $Author$ # $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) FIND_PACKAGE(RTI)
# Grantlee5 is Qt5-based and optional for Qt6 migration # 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.cpp
main_grantlee_gui.ui main_grantlee_gui.ui
) )
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(codegen_gui NGL_TARGET_LINK_LIBRARIES(codegen_gui
codegen_grantlee codegen_grantlee
LtsCommandLineParser LtsCommandLineParser
nglapplication nglapplication
Qt6::Widgets ${Qt6_Widgets}
Grantlee5::Templates Grantlee5::Templates
) )
endif()
ELSE() ELSE()
message(STATUS "BUILD_GRANTLEE disabled or Grantlee not found; skipping codegen_grantlee, ngl_codegen, and codegen_gui targets") message(STATUS "BUILD_GRANTLEE disabled or Grantlee not found; skipping codegen_grantlee, ngl_codegen, and codegen_gui targets")
ENDIF() ENDIF()
@@ -1339,16 +1339,16 @@ StructBuilder::ServiceTypeStruct StructBuilder::extractServiceAndTypeFromTypenam
if (!extServiceRef.isEmpty()) if (!extServiceRef.isEmpty())
{ {
if (extServiceRef.contains(QLatin1Char('<'))) if (extServiceRef.contains(QLatin1Char('<')))
ret.service = QString(extServiceRef).split(QLatin1Char('<')).at(1); ret.service = extServiceRef.toString().split(QLatin1Char('<')).at(1);
else else
ret.service = QString(extServiceRef); ret.service = extServiceRef.toString();
} }
if (!extTypeRef.isEmpty()) if (!extTypeRef.isEmpty())
{ {
if (extTypeRef.contains(QLatin1Char('>'))) if (extTypeRef.contains(QLatin1Char('>')))
ret.type = QString(extTypeRef).split(QLatin1Char('>')).at(0); ret.type = extTypeRef.toString().split(QLatin1Char('>')).at(0);
else else
ret.type = QString(extTypeRef); ret.type = extTypeRef.toString();
} }
return ret; return ret;
} }
@@ -8,6 +8,14 @@
# LtsAppDescriptor (lib) # 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 SET(LtsAppDescriptor_SRCS
lts_app_descriptor.cpp lts_app_descriptor.cpp
lts_app_descriptor.h lts_app_descriptor.h
@@ -64,12 +72,14 @@ NGL_TARGET_LINK_LIBRARIES(LtsAppDescriptorChecker
# ${CMAKE_CURRENT_SOURCE_DIR}/../ # ${CMAKE_CURRENT_SOURCE_DIR}/../
#) #)
if(QT6_GUI_AVAILABLE)
#NGL_TARGET_LINK_LIBRARIES(LtsAppDescriptorEditor #NGL_TARGET_LINK_LIBRARIES(LtsAppDescriptorEditor
# PUBLIC # PUBLIC
# Qt6::Core # Qt6::Core
# Qt6::Widgets # ${Qt6_Widgets}
# LtsAppDescriptor # LtsAppDescriptor
#) #)
endif()
#NGL_INSTALL_TARGET(LtsAppDescriptorEditor) #not visible for end-user #NGL_INSTALL_TARGET(LtsAppDescriptorEditor) #not visible for end-user
@@ -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$ # $Id$
# $HeadURL$ # $HeadURL$
# $Author$ # $Author$
@@ -28,6 +43,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(LtsAppManager
${CMAKE_CURRENT_SOURCE_DIR}/AppChooser/ ${CMAKE_CURRENT_SOURCE_DIR}/AppChooser/
) )
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(LtsAppManager NGL_TARGET_LINK_LIBRARIES(LtsAppManager
PRIVATE PRIVATE
NGLLogger NGLLogger
@@ -40,8 +56,8 @@ NGL_TARGET_LINK_LIBRARIES(LtsAppManager
LtsUtilsSettings LtsUtilsSettings
LtsMultiMonitor LtsMultiMonitor
ProjectConfig ProjectConfig
Qt6::Gui ${Qt6_Gui}
Qt6::Widgets ${Qt6_Widgets}
Qt6::Network # debug server Qt6::Network # debug server
OpmSettingsGuiPluginInterface OpmSettingsGuiPluginInterface
LtsPluginLoader LtsPluginLoader
@@ -49,6 +65,7 @@ NGL_TARGET_LINK_LIBRARIES(LtsAppManager
Qt6::Core Qt6::Core
LtsAppDescriptor LtsAppDescriptor
) )
endif()
NGL_INSTALL_TARGET(LtsAppManager) NGL_INSTALL_TARGET(LtsAppManager)
ENDIF(BUILD_RTI) ENDIF(BUILD_RTI)
@@ -5,6 +5,14 @@
# Created by Christian Ehrlicher, SLSE, 2016-08-31 # 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) FIND_PACKAGE(GeographicLib)
NGL_ADD_LIBRARY2(LtsCoordTrans WS AAR SV HLA SHARED NGL_ADD_LIBRARY2(LtsCoordTrans WS AAR SV HLA SHARED
lts_coord_trans.h lts_coord_trans.h
@@ -38,13 +46,15 @@ NGL_WRAP_UI(ltsCoordWidget_SRCS
lts_coord_widget_wgs84.ui lts_coord_widget_wgs84.ui
) )
NGL_ADD_LIBRARY2(ltsCoordWidget WS AAR SV SHARED ${ltsCoordWidget_SRCS}) NGL_ADD_LIBRARY2(ltsCoordWidget WS AAR SV SHARED ${ltsCoordWidget_SRCS})
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(ltsCoordWidget NGL_TARGET_LINK_LIBRARIES(ltsCoordWidget
PRIVATE PRIVATE
LtsCoordTrans LtsCoordTrans
PUBLIC PUBLIC
Qt6::Core Qt6::Core
Qt6::Widgets ${Qt6_Widgets}
) )
endif()
NGL_TARGET_INCLUDE_DIRECTORIES(ltsCoordWidget NGL_TARGET_INCLUDE_DIRECTORIES(ltsCoordWidget
PUBLIC PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../ ${CMAKE_CURRENT_SOURCE_DIR}/../
@@ -5,6 +5,14 @@
# $Author$ # $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 SET(UnitTestSources
lts_coordinate_unit_test.cpp lts_coordinate_unit_test.cpp
lts_coordinate_unit_test.h lts_coordinate_unit_test.h
@@ -22,7 +30,7 @@ TARGET_LINK_LIBRARIES(commonUnitTestCoordinate
situationMapCommon situationMapCommon
situationMapElevationMap situationMapElevationMap
Qt6::Core Qt6::Core
Qt6::Gui ${Qt6_Gui}
Qt6::Test) Qt6::Test)
ADD_TEST(NAME commonUnitTestCoordinate COMMAND $<TARGET_FILE:commonUnitTestCoordinate>) ADD_TEST(NAME commonUnitTestCoordinate COMMAND $<TARGET_FILE:commonUnitTestCoordinate>)
@@ -4,6 +4,14 @@
# $Author$ # $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 NGL_ADD_LIBRARY2(WS SV HLA LtsElevation SHARED
lts_elevation_manager.cpp lts_elevation_manager.cpp
lts_elevation_manager.h lts_elevation_manager.h
@@ -18,6 +26,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(LtsElevation
${CMAKE_SOURCE_DIR}/Lts/Viewer/SituationMap ${CMAKE_SOURCE_DIR}/Lts/Viewer/SituationMap
${CMAKE_SOURCE_DIR}/Lts/Viewer/SituationMap/Common ${CMAKE_SOURCE_DIR}/Lts/Viewer/SituationMap/Common
) )
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(LtsElevation NGL_TARGET_LINK_LIBRARIES(LtsElevation
PRIVATE PRIVATE
NGLLogger NGLLogger
@@ -28,8 +37,9 @@ NGL_TARGET_LINK_LIBRARIES(LtsElevation
PUBLIC PUBLIC
LtsUtilsCoreHeaderOnly LtsUtilsCoreHeaderOnly
Qt6::Core Qt6::Core
Qt6::Gui ${Qt6_Gui}
) )
endif()
if(BUILD_RTI) if(BUILD_RTI)
target_link_libraries(LtsElevation PRIVATE AsmDataPluginInterface) target_link_libraries(LtsElevation PRIVATE AsmDataPluginInterface)
@@ -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@ # @RDE_HEADER@
# $Id$ # $Id$
@@ -18,7 +26,7 @@
# situationMapCommon # situationMapCommon
# situationMapElevationMap # situationMapElevationMap
# Qt6::Core # Qt6::Core
# Qt6::Gui # ${Qt6_Gui}
# Qt6::Test) # Qt6::Test)
# #
# ADD_TEST(NAME commenUnitTestElevation COMMAND $<TARGET_FILE:commenUnitTestElevation>) # ADD_TEST(NAME commenUnitTestElevation COMMAND $<TARGET_FILE:commenUnitTestElevation>)
@@ -5,7 +5,7 @@
# Created by hjl, SLSE, 2016-05-31 # Created by hjl, SLSE, 2016-05-31
# #
FIND_PACKAGE(OpenSSL REQUIRED) FIND_PACKAGE(OpenSSL)
SET(ltslicence_SRCS SET(ltslicence_SRCS
aes_crypt.cpp aes_crypt.cpp
@@ -14,6 +14,7 @@ SET(ltslicence_SRCS
lts_licence.h lts_licence.h
) )
if(OPENSSL_FOUND)
NGL_ADD_LIBRARY2(AAR SV WS LtsLicence SHARED ${ltslicence_SRCS}) NGL_ADD_LIBRARY2(AAR SV WS LtsLicence SHARED ${ltslicence_SRCS})
NGL_TARGET_INCLUDE_DIRECTORIES(LtsLicence NGL_TARGET_INCLUDE_DIRECTORIES(LtsLicence
@@ -39,3 +40,6 @@ IF (BUILD_TESTING AND TARGET LtsLicence)
) )
ADD_TEST(NAME aes_crypt_test COMMAND $<TARGET_FILE:aes_crypt_test>) ADD_TEST(NAME aes_crypt_test COMMAND $<TARGET_FILE:aes_crypt_test>)
ENDIF() ENDIF()
else()
message(WARNING "LtsLicence skipped: OpenSSL not found")
endif()
@@ -8,6 +8,21 @@
# LtsMultiMonitor # 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 SET(LtsMultiMonitor_SRCS
lts_multi_monitor_export.h lts_multi_monitor_export.h
lts_multi_monitor.cpp lts_multi_monitor.cpp
@@ -36,16 +51,18 @@ NGL_TARGET_INCLUDE_DIRECTORIES(LtsMultiMonitor
${CMAKE_SOURCE_DIR}/Lts/Common/LtsUtils ${CMAKE_SOURCE_DIR}/Lts/Common/LtsUtils
) )
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(LtsMultiMonitor NGL_TARGET_LINK_LIBRARIES(LtsMultiMonitor
PUBLIC PUBLIC
Qt6::Core Qt6::Core
Qt6::Widgets ${Qt6_Widgets}
PRIVATE PRIVATE
Qt6::Gui ${Qt6_Gui}
LtsWidgets LtsWidgets
LtsSessionData LtsSessionData
LtsUtilsCore LtsUtilsCore
LtsUtilsGuiDds LtsUtilsGuiDds
) )
endif()
NGL_INSTALL_TARGET(LtsMultiMonitor) NGL_INSTALL_TARGET(LtsMultiMonitor)
@@ -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 SET(LtsNoti_SRCS
lts_notification.h lts_notification.h
lts_notification.cpp lts_notification.cpp
@@ -21,8 +29,10 @@ NGL_TARGET_INCLUDE_DIRECTORIES(LtsNotification
${CMAKE_CURRENT_BINARY_DIR}/../ ${CMAKE_CURRENT_BINARY_DIR}/../
) )
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(LtsNotification NGL_TARGET_LINK_LIBRARIES(LtsNotification
Qt6::Widgets ${Qt6_Widgets}
) )
endif()
NGL_INSTALL_TARGET(LtsNotification) NGL_INSTALL_TARGET(LtsNotification)
@@ -7,6 +7,14 @@
# LtsPluginLoader # 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_ADD_LIBRARY2(ALL LtsPluginLoader SHARED lts_plugin_loader.cpp lts_plugin_loader.h)
NGL_TARGET_INCLUDE_DIRECTORIES(LtsPluginLoader NGL_TARGET_INCLUDE_DIRECTORIES(LtsPluginLoader
PUBLIC PUBLIC
@@ -45,6 +53,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(LtsPluginManager
${CMAKE_CURRENT_SOURCE_DIR}/../ ${CMAKE_CURRENT_SOURCE_DIR}/../
) )
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(LtsPluginManager NGL_TARGET_LINK_LIBRARIES(LtsPluginManager
PRIVATE PRIVATE
NGLLogger NGLLogger
@@ -54,12 +63,13 @@ NGL_TARGET_LINK_LIBRARIES(LtsPluginManager
LtsWidgets LtsWidgets
LtsSession LtsSession
LtsSessionData LtsSessionData
Qt6::Widgets ${Qt6_Widgets}
PUBLIC PUBLIC
ProjectConfig ProjectConfig
LtsAppDescriptor LtsAppDescriptor
Qt6::Core Qt6::Core
) )
endif()
NGL_INSTALL_TARGET(LtsPluginManager) NGL_INSTALL_TARGET(LtsPluginManager)
ENDIF(BUILD_RTI) ENDIF(BUILD_RTI)
@@ -6,7 +6,9 @@
# Created by Christian Ehrlicher, SLSE, 2017-12-05 # Created by Christian Ehrlicher, SLSE, 2017-12-05
# #
FIND_PACKAGE(KDReports) if(QT6_GUI_AVAILABLE)
find_package(KDReports QUIET)
endif()
SET(SRCS SET(SRCS
printing_base.cpp printing_base.cpp
@@ -15,12 +17,13 @@ SET(SRCS
printing.h 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_ADD_LIBRARY2(WS LtsPrinting SHARED ${SRCS})
NGL_TARGET_INCLUDE_DIRECTORIES(LtsPrinting NGL_TARGET_INCLUDE_DIRECTORIES(LtsPrinting
PUBLIC PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../ ${CMAKE_CURRENT_SOURCE_DIR}/../
) )
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(LtsPrinting NGL_TARGET_LINK_LIBRARIES(LtsPrinting
PRIVATE PRIVATE
KDReports::KDReports KDReports::KDReports
@@ -32,6 +35,7 @@ if (KDReports_FOUND AND BUILD_CODIFICATION)
Qt6::PrintSupport Qt6::PrintSupport
Qt6::Core Qt6::Core
) )
endif()
NGL_INSTALL_TARGET(LtsPrinting) NGL_INSTALL_TARGET(LtsPrinting)
else() else()
message(STATUS "KDReports not found or BUILD_RTI disabled; skipping LtsPrinting target") message(STATUS "KDReports not found or BUILD_RTI disabled; skipping LtsPrinting target")
@@ -5,6 +5,14 @@
# Created by Christian Roeskens, NLSE, 2018-03-02 # 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 SET(LtsProjectionWorkstation_SRCS
lts_projection_workstation.h lts_projection_workstation.h
@@ -32,16 +40,18 @@ NGL_TARGET_INCLUDE_DIRECTORIES(LtsProjectionWorkstation
${CMAKE_CURRENT_SOURCE_DIR}/../ ${CMAKE_CURRENT_SOURCE_DIR}/../
) )
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(LtsProjectionWorkstation NGL_TARGET_LINK_LIBRARIES(LtsProjectionWorkstation
PUBLIC PUBLIC
Qt6::Core Qt6::Core
PRIVATE PRIVATE
Qt6::Gui ${Qt6_Gui}
NGLLogger NGLLogger
nglsettings nglsettings
LtsWebSocketServer LtsWebSocketServer
LtsSession LtsSession
LtsSessionData LtsSessionData
) )
endif()
NGL_INSTALL_TARGET(LtsProjectionWorkstation) NGL_INSTALL_TARGET(LtsProjectionWorkstation)
@@ -12,6 +12,14 @@
# Library # 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 SET(LtsScriptTimeline_SRCS
tools.h tools.h
tools.cpp tools.cpp
@@ -65,10 +73,12 @@ NGL_TARGET_INCLUDE_DIRECTORIES(LtsScriptTimeline
${CMAKE_CURRENT_SOURCE_DIR}/../ ${CMAKE_CURRENT_SOURCE_DIR}/../
) )
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(LtsScriptTimeline NGL_TARGET_LINK_LIBRARIES(LtsScriptTimeline
Qt6::Core Qt6::Core
Qt6::Widgets ${Qt6_Widgets}
LtsWidgets LtsWidgets
LtsSessionData LtsSessionData
) )
endif()
ENDIF(BUILD_RTI) ENDIF(BUILD_RTI)
@@ -27,5 +27,5 @@ NGL_TARGET_LINK_LIBRARIES(LtsSerialPortQuerry
PRIVATE PRIVATE
PUBLIC PUBLIC
NGLLogger NGLLogger
Qt6::SerialPort $<IF:$<TARGET_EXISTS:Qt6::SerialPort>,Qt6::SerialPort,>
) )
@@ -6,6 +6,14 @@
# #
# RTI Connext DDS - uses IMPORTED targets from parent CMakeLists.txt # 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) OPTION(BUILD_RTI "Build with RTI Connext DDS support" ON)
# Find RTI Connext DDS - manual configuration (no CMake config file available) # Find RTI Connext DDS - manual configuration (no CMake config file available)
@@ -88,7 +96,7 @@ SET(LtsSession_PRIVATE_LIBS
LtsSessionData LtsSessionData
LtsUtilsGuiDds # ReqHelpr & for Debug Menu ! TODO: rm on release! LtsUtilsGuiDds # ReqHelpr & for Debug Menu ! TODO: rm on release!
LtsNotification LtsNotification
Qt6::Svg $<IF:$<TARGET_EXISTS:Qt6::Svg>,Qt6::Svg,>
) )
IF(SVCCORECLIENT_LIBRARY) IF(SVCCORECLIENT_LIBRARY)
LIST(APPEND LtsSession_PRIVATE_LIBS ${SVCCORECLIENT_LIBRARY}) LIST(APPEND LtsSession_PRIVATE_LIBS ${SVCCORECLIENT_LIBRARY})
@@ -133,11 +141,13 @@ NGL_TARGET_INCLUDE_DIRECTORIES(LtsSessionData
${CMAKE_CURRENT_SOURCE_DIR}/../ ${CMAKE_CURRENT_SOURCE_DIR}/../
) )
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(LtsSessionData NGL_TARGET_LINK_LIBRARIES(LtsSessionData
PUBLIC PUBLIC
Qt6::Core Qt6::Core
Qt6::Gui # QPixmap as Storage for Profile Picture Qt6::Gui # QPixmap as Storage for Profile Picture
) )
endif()
IF(BUILD_RTI) IF(BUILD_RTI)
NGL_TARGET_LINK_LIBRARIES(LtsSessionData NGL_TARGET_LINK_LIBRARIES(LtsSessionData
PUBLIC PUBLIC
@@ -8,6 +8,21 @@
# Created by Mike Wille, SLTE, 2021-05-18 # 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 SET(src
timeline_model.h timeline_model.h
timeline_model.cpp timeline_model.cpp
@@ -51,25 +66,29 @@ NGL_TARGET_INCLUDE_DIRECTORIES(LtsTimeline
${CMAKE_CURRENT_SOURCE_DIR}/../ ${CMAKE_CURRENT_SOURCE_DIR}/../
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
) )
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(LtsTimeline NGL_TARGET_LINK_LIBRARIES(LtsTimeline
PRIVATE PRIVATE
NGLLogger NGLLogger
ngltools # DTG ngltools # DTG
LtsWidgets # LtsMessageDialogNew for remove filter track LtsWidgets # LtsMessageDialogNew for remove filter track
Qt6::Core Qt6::Core
Qt6::Gui ${Qt6_Gui}
Qt6::Widgets ${Qt6_Widgets}
) )
endif()
NGL_INSTALL_TARGET(LtsTimeline) NGL_INSTALL_TARGET(LtsTimeline)
# LtsTimelineTest # LtsTimelineTest
NGL_ADD_EXECUTABLE(WS LtsTimelineTest main.cpp) NGL_ADD_EXECUTABLE(WS LtsTimelineTest main.cpp)
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(LtsTimelineTest NGL_TARGET_LINK_LIBRARIES(LtsTimelineTest
LtsTimeline LtsTimeline
nglapplication nglapplication
NGLLogger NGLLogger
Qt6::Core Qt6::Core
Qt6::Gui ${Qt6_Gui}
Qt6::Widgets ${Qt6_Widgets}
) )
endif()
@@ -8,6 +8,21 @@
# Created by Mike Wille, SLSE, 2017-02-10 # 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 SET(timeline_SRCS
EventDelegate.cpp EventDelegate.cpp
EventTools.cpp EventTools.cpp
@@ -65,15 +80,17 @@ NGL_TARGET_INCLUDE_DIRECTORIES(LtsTimelineClassic
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
) )
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(LtsTimelineClassic NGL_TARGET_LINK_LIBRARIES(LtsTimelineClassic
PRIVATE PRIVATE
NGLLogger NGLLogger
ngltools # DTG ngltools # DTG
Qt6::Core Qt6::Core
Qt6::Gui ${Qt6_Gui}
Qt6::Widgets ${Qt6_Widgets}
LtsSessionDataDds LtsSessionDataDds
) )
endif()
@@ -5,6 +5,14 @@
# Created by Mike Wille, SLSE, 2016-05-12 # 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 SET(srcs
connect_dialog.h connect_dialog.h
connect_dialog.cpp connect_dialog.cpp
@@ -22,7 +30,9 @@ NGL_TARGET_INCLUDE_DIRECTORIES(LtsUtilsGuiConnectDialog
${CMAKE_CURRENT_SOURCE_DIR}/../ ${CMAKE_CURRENT_SOURCE_DIR}/../
${CMAKE_CURRENT_BINARY_DIR}/../ ${CMAKE_CURRENT_BINARY_DIR}/../
) )
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(LtsUtilsGuiConnectDialog NGL_TARGET_LINK_LIBRARIES(LtsUtilsGuiConnectDialog
Qt6::Widgets ${Qt6_Widgets}
LtsWidgets LtsWidgets
) )
endif()
@@ -6,6 +6,21 @@
# Created by Mike Wille, SLSE, 2016-09-19 # 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 SET(SRCS
dds_vector_to_pixmap.cpp dds_vector_to_pixmap.cpp
dds_vector_to_pixmap.h dds_vector_to_pixmap.h
@@ -20,14 +35,16 @@ NGL_TARGET_INCLUDE_DIRECTORIES(LtsUtilsGuiDds
${CMAKE_CURRENT_SOURCE_DIR}/../../../ ${CMAKE_CURRENT_SOURCE_DIR}/../../../
${CMAKE_CURRENT_BINARY_DIR}/../ ${CMAKE_CURRENT_BINARY_DIR}/../
) )
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(LtsUtilsGuiDds NGL_TARGET_LINK_LIBRARIES(LtsUtilsGuiDds
PUBLIC PUBLIC
LtsUtilsCoreHeaderOnly LtsUtilsCoreHeaderOnly
LtsWidgets LtsWidgets
Qt6::Gui ${Qt6_Gui}
Qt6::Widgets ${Qt6_Widgets}
Qt6::Svg Qt6::Svg
) )
endif()
IF(BUILD_RTI) IF(BUILD_RTI)
TARGET_LINK_LIBRARIES(LtsUtilsGuiDds PUBLIC ddscore) TARGET_LINK_LIBRARIES(LtsUtilsGuiDds PUBLIC ddscore)
ENDIF(BUILD_RTI) ENDIF(BUILD_RTI)
@@ -8,6 +8,21 @@
# Lts Widgets library # 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 SET(ltsvkeyboard_SRCS
LtsKeyPushButton.h LtsKeyPushButton.h
LtsKeyPushButton.cpp LtsKeyPushButton.cpp
@@ -26,13 +41,15 @@ NGL_TARGET_INCLUDE_DIRECTORIES(LtsVirtualKeyboard
${CMAKE_CURRENT_SOURCE_DIR}/../ ${CMAKE_CURRENT_SOURCE_DIR}/../
) )
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(LtsVirtualKeyboard NGL_TARGET_LINK_LIBRARIES(LtsVirtualKeyboard
PRIVATE PRIVATE
PUBLIC PUBLIC
LtsWidgets LtsWidgets
LtsSession LtsSession
LtsAppManager LtsAppManager
Qt6::Widgets ${Qt6_Widgets}
Qt6::Gui ${Qt6_Gui}
) )
endif()
ENDIF(BUILD_RTI) ENDIF(BUILD_RTI)
@@ -7,6 +7,14 @@
# #
# --- Library LtsWebSocketCommon -------------------------------------------------------------------------------- # --- 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 SET(LtsWebSocketCommon_SRCS
client_message_factory.cpp client_message_factory.cpp
client_message_factory.h client_message_factory.h
@@ -30,7 +38,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(LtsWebSocketCommon
NGL_TARGET_LINK_LIBRARIES(LtsWebSocketCommon NGL_TARGET_LINK_LIBRARIES(LtsWebSocketCommon
Qt6::Core Qt6::Core
Qt6::WebSockets ${Qt6_WebSockets}
NGLLogger NGLLogger
) )
@@ -3,7 +3,9 @@
#include "client_connection.h" #include "client_connection.h"
#include "logger.h" #include "logger.h"
#ifdef QT6_WEBSOCKETS_AVAILABLE
#include <QtWebSockets/QWebSocket> #include <QtWebSockets/QWebSocket>
#endif
namespace LtsWebSocket namespace LtsWebSocket
{ {
@@ -20,6 +22,7 @@ ClientConnection::~ClientConnection()
qDeleteAll(m_messageQueue); qDeleteAll(m_messageQueue);
} }
#ifdef QT6_WEBSOCKETS_AVAILABLE
bool ClientConnection::init() bool ClientConnection::init()
{ {
if (m_socket == nullptr) if (m_socket == nullptr)
@@ -81,5 +84,6 @@ void ClientConnection::onSocketDisconnect()
exit(0); exit(0);
emit disconnected(this); emit disconnected(this);
} }
#endif
} // namespace LtsWebSocket } // namespace LtsWebSocket
@@ -9,7 +9,25 @@
#include <QtCore/QQueue> #include <QtCore/QQueue>
#include <QtCore/QThread> #include <QtCore/QThread>
#ifdef QT6_WEBSOCKETS_AVAILABLE
class QWebSocket; 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 namespace LtsWebSocket
{ {
@@ -22,6 +40,7 @@ class LTSWEBSOCKETSERVER_EXPORT ClientConnection : public QThread, public ReplyH
~ClientConnection(); ~ClientConnection();
#ifdef QT6_WEBSOCKETS_AVAILABLE
bool init(); bool init();
void addReply(ReplyMessage* message) override; void addReply(ReplyMessage* message) override;
@@ -30,6 +49,11 @@ class LTSWEBSOCKETSERVER_EXPORT ClientConnection : public QThread, public ReplyH
{ {
return m_socket; return m_socket;
} }
#else
bool init() { return false; }
void addReply(ReplyMessage* /*message*/) override {}
QWebSocket* webSocket() { return nullptr; }
#endif
signals: signals:
@@ -38,13 +62,17 @@ class LTSWEBSOCKETSERVER_EXPORT ClientConnection : public QThread, public ReplyH
void disconnected(ClientConnection* client); void disconnected(ClientConnection* client);
private slots: private slots:
#ifdef QT6_WEBSOCKETS_AVAILABLE
void onNewTextMessageFromSocket(const QString& message); void onNewTextMessageFromSocket(const QString& message);
void sendMessagesFromQueue(); void sendMessagesFromQueue();
void onSocketDisconnect(); void onSocketDisconnect();
#endif
private: private:
NGL::INGLLogger& m_logger; NGL::INGLLogger& m_logger;
#ifdef QT6_WEBSOCKETS_AVAILABLE
void sendMessages(); void sendMessages();
#endif
QWebSocket* m_socket; QWebSocket* m_socket;
QQueue<ReplyMessage*> m_messageQueue; QQueue<ReplyMessage*> m_messageQueue;
}; };
@@ -5,8 +5,10 @@
#include "client_connection.h" #include "client_connection.h"
#include "logger.h" #include "logger.h"
#ifdef QT6_WEBSOCKETS_AVAILABLE
#include <QtWebSockets/QWebSocket> #include <QtWebSockets/QWebSocket>
#include <utility> #include <utility>
#endif
using namespace LtsWebSocket; using namespace LtsWebSocket;
@@ -17,10 +19,13 @@ ConnectionHandler::ConnectionHandler(QObject* parent)
ConnectionHandler::~ConnectionHandler() ConnectionHandler::~ConnectionHandler()
{ {
#ifdef QT6_WEBSOCKETS_AVAILABLE
for (auto connection : std::as_const(m_connections)) for (auto connection : std::as_const(m_connections))
connection->disconnect(this); connection->disconnect(this);
#endif
} }
#ifdef QT6_WEBSOCKETS_AVAILABLE
bool ConnectionHandler::init(const QString& serviceName, unsigned short port) bool ConnectionHandler::init(const QString& serviceName, unsigned short port)
{ {
if (m_server != nullptr) if (m_server != nullptr)
@@ -87,3 +92,4 @@ void ConnectionHandler::onNewConnection()
<< socket->localPort(); << socket->localPort();
} }
} }
#endif
@@ -4,9 +4,17 @@
#include "logger.h" #include "logger.h"
#include <QtCore/QObject> #include <QtCore/QObject>
#include <QtCore/QSet>
#include <QtNetwork/QHostAddress> #include <QtNetwork/QHostAddress>
#ifdef QT6_WEBSOCKETS_AVAILABLE
#include <QtWebSockets/QWebSocketServer> #include <QtWebSockets/QWebSocketServer>
#include <QtWebSockets/qwebsocketprotocol.h> #include <QtWebSockets/qwebsocketprotocol.h>
#else
namespace LtsWebSocket { class QWebSocketServerStub; }
using QWebSocketServer = LtsWebSocket::QWebSocketServerStub;
namespace QWebSocketProtocol { enum class CloseCode { NormalClosure = 1000 }; }
#endif
namespace LtsWebSocket namespace LtsWebSocket
{ {
@@ -21,6 +29,7 @@ class ConnectionHandler : public QObject
explicit ConnectionHandler(QObject* parent = nullptr); explicit ConnectionHandler(QObject* parent = nullptr);
~ConnectionHandler(); ~ConnectionHandler();
#ifdef QT6_WEBSOCKETS_AVAILABLE
bool init(const QString& serviceName, unsigned short port); bool init(const QString& serviceName, unsigned short port);
void sendToAllClients(ReplyMessage* message); void sendToAllClients(ReplyMessage* message);
@@ -29,6 +38,11 @@ class ConnectionHandler : public QObject
{ {
return m_server->serverPort(); 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: signals:
@@ -39,12 +53,18 @@ class ConnectionHandler : public QObject
void clientConnected(ClientConnection* client); void clientConnected(ClientConnection* client);
private slots: private slots:
#ifdef QT6_WEBSOCKETS_AVAILABLE
void onServerError(QWebSocketProtocol::CloseCode closeCode); void onServerError(QWebSocketProtocol::CloseCode closeCode);
void onNewConnection(); void onNewConnection();
#endif
private: private:
NGL::INGLLogger& m_logger; NGL::INGLLogger& m_logger;
#ifdef QT6_WEBSOCKETS_AVAILABLE
QWebSocketServer* m_server; QWebSocketServer* m_server;
#else
void* m_server;
#endif
QSet<ClientConnection*> m_connections; QSet<ClientConnection*> m_connections;
}; };
} // namespace LtsWebSocket } // namespace LtsWebSocket
@@ -2,6 +2,7 @@
#include "lts_web_socket_server.h" #include "lts_web_socket_server.h"
#ifdef QT6_WEBSOCKETS_AVAILABLE
#include "client_connection.h" #include "client_connection.h"
#include "connection_handler.h" #include "connection_handler.h"
@@ -120,3 +121,17 @@ void LtsWebSocketServer::onQueueTimerTimeout()
} }
} // namespace LtsWebSocket } // 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
@@ -12,6 +12,7 @@
class QTimer; class QTimer;
#ifdef QT6_WEBSOCKETS_AVAILABLE
namespace LtsWebSocket namespace LtsWebSocket
{ {
class ConnectionHandler; class ConnectionHandler;
@@ -62,3 +63,35 @@ class LTSWEBSOCKETSERVER_EXPORT LtsWebSocketServer : public QObject
LOGGER_T m_logger; LOGGER_T m_logger;
}; };
} // namespace LtsWebSocket } // 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
@@ -8,6 +8,21 @@
# Lts Widgets library # 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 SET(ltswidgets_SRCS
#lts_abstract_table_model.h #lts_abstract_table_model.h
#lts_checkable_table_model.h #lts_checkable_table_model.h
@@ -154,6 +169,7 @@ NGL_ADD_LIBRARY(WS TOOLSWS TOOLSSV LtsWidgets SHARED ${ltswidgets_SRCS})
# Qt6 Dependencies immer setzen (auch wenn BUILD_RTI=OFF) # Qt6 Dependencies immer setzen (auch wenn BUILD_RTI=OFF)
# Die Library wird gebaut, aber nur bei BUILD_RTI=ON installiert/verwendet # Die Library wird gebaut, aber nur bei BUILD_RTI=ON installiert/verwendet
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(LtsWidgets NGL_TARGET_LINK_LIBRARIES(LtsWidgets
PRIVATE PRIVATE
Qt6::Network # for QHostInfo - for portability Qt6::Network # for QHostInfo - for portability
@@ -167,9 +183,10 @@ NGL_TARGET_LINK_LIBRARIES(LtsWidgets
LtsUtilsCore LtsUtilsCore
LtsUtilsSettings LtsUtilsSettings
Qt6::Core Qt6::Core
Qt6::Widgets ${Qt6_Widgets}
Qt6::Gui ${Qt6_Gui}
) )
endif()
# Include directories needed for all builds (not just BUILD_RTI) # Include directories needed for all builds (not just BUILD_RTI)
NGL_TARGET_INCLUDE_DIRECTORIES(LtsWidgets NGL_TARGET_INCLUDE_DIRECTORIES(LtsWidgets
@@ -8,6 +8,14 @@
# Topic Editor Interface # 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( ADD_INTERFACE_LIBRARY(
TopicEditorInterface TopicEditorInterface
${CMAKE_CURRENT_SOURCE_DIR}/topic_editor_interface.h ${CMAKE_CURRENT_SOURCE_DIR}/topic_editor_interface.h
@@ -40,11 +48,13 @@ NGL_TARGET_INCLUDE_DIRECTORIES(TopicEditorBase
${CMAKE_CURRENT_BINARY_DIR}/../ # auto-export file ${CMAKE_CURRENT_BINARY_DIR}/../ # auto-export file
) )
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(TopicEditorBase NGL_TARGET_LINK_LIBRARIES(TopicEditorBase
LtsScriptTimeline LtsScriptTimeline
Qt6::Widgets ${Qt6_Widgets}
Qt6::Core Qt6::Core
LtsWidgets LtsWidgets
LtsUtilsCore LtsUtilsCore
) )
endif()
ENDIF(BUILD_RTI) ENDIF(BUILD_RTI)
@@ -1,6 +1,8 @@
#include <QtNetwork/QTcpServer> #include <QtNetwork/QTcpServer>
#include <QtNetwork/QTcpSocket> #include <QtNetwork/QTcpSocket>
#ifdef QT6_WEBSOCKETS_AVAILABLE
#include <QtWebSockets/QWebSocketServer> #include <QtWebSockets/QWebSocketServer>
#endif
#include <httq/AbstractServer.h> #include <httq/AbstractServer.h>
#include <httq/HttpRequest.h> #include <httq/HttpRequest.h>
#include <httq/Logger.h> #include <httq/Logger.h>
@@ -43,6 +45,7 @@ void AbstractServer::slotNewConnection()
connect(req, &HttpRequest::signalUpgrade, this, [this, req](QTcpSocket* sock) { connect(req, &HttpRequest::signalUpgrade, this, [this, req](QTcpSocket* sock) {
mLogger->debug(QStringLiteral("signalUpgrade")); mLogger->debug(QStringLiteral("signalUpgrade"));
#ifdef QT6_WEBSOCKETS_AVAILABLE
QWebSocketServer* wsSvr = webSocketServer(); QWebSocketServer* wsSvr = webSocketServer();
if (wsSvr == nullptr) if (wsSvr == nullptr)
@@ -54,6 +57,12 @@ void AbstractServer::slotNewConnection()
} }
wsSvr->handleConnection(sock); wsSvr->handleConnection(sock);
#else
mLogger->debug(QStringLiteral("websocket support not available"));
sock->close();
sock->deleteLater();
return;
#endif
emit sock->readyRead(); emit sock->readyRead();
}); });
@@ -1,5 +1,13 @@
# Modified CMakeLists.txt from github.com/wille-io/httq # 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 set(src
include/http_parser.h include/http_parser.h
include/http_parser.c # TODO: move out of include dir include/http_parser.c # TODO: move out of include dir
@@ -26,7 +34,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(httq
NGL_TARGET_LINK_LIBRARIES(httq NGL_TARGET_LINK_LIBRARIES(httq
Qt6::Core Qt6::Core
Qt6::Network Qt6::Network
Qt6::WebSockets ${Qt6_WebSockets}
) )
NGL_INSTALL_TARGET(httq) NGL_INSTALL_TARGET(httq)
@@ -6,7 +6,9 @@
#include <QtCore/QObject> #include <QtCore/QObject>
class QTcpServer; class QTcpServer;
#ifdef QT6_WEBSOCKETS_AVAILABLE
class QWebSocketServer; class QWebSocketServer;
#endif
namespace httq namespace httq
{ {
@@ -22,10 +24,12 @@ class HTTQ_EXPORT AbstractServer : public QObject
virtual bool newHttpConnection(HttpRequest* request) = 0; virtual bool newHttpConnection(HttpRequest* request) = 0;
#ifdef QT6_WEBSOCKETS_AVAILABLE
virtual QWebSocketServer* webSocketServer() const virtual QWebSocketServer* webSocketServer() const
{ {
return nullptr; return nullptr;
} }
#endif
virtual LoggerFactory* createLoggerFactory(); virtual LoggerFactory* createLoggerFactory();
LoggerFactory* getLoggerFactory(); LoggerFactory* getLoggerFactory();
@@ -5,6 +5,14 @@
# Created by Christian Ehrlicher, SLSE, 2016-03-01 # 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(Data)
ADD_SUBDIRECTORY(Gui) ADD_SUBDIRECTORY(Gui)
ADD_SUBDIRECTORY(Helper) ADD_SUBDIRECTORY(Helper)
@@ -17,7 +25,7 @@ ADD_INTERFACE_LIBRARY(AsbDataPluginInterface
${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/..
DataPluginInterface DataPluginInterface
advancedSymbology 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}/asb_symbol_proxy_gui_plugin_interface.h
${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/..
GuiPluginInterface GuiPluginInterface
Qt6::Gui ${Qt6_Gui}
) )
@@ -5,6 +5,14 @@
# Created by Mike Wille, SLSE, 2016-09-05 # 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 NGL_ADD_LIBRARY(WS AsbData STATIC
asb_foreign_interface_impl.cpp asb_foreign_interface_impl.cpp
asb_foreign_interface_impl.h 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}/../../../Viewer/SituationMap/Symbology
${CMAKE_CURRENT_SOURCE_DIR}/../../../../Z/src ${CMAKE_CURRENT_SOURCE_DIR}/../../../../Z/src
) )
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(AsbData NGL_TARGET_LINK_LIBRARIES(AsbData
GimDataPluginInterface GimDataPluginInterface
AsbDataPluginInterface AsbDataPluginInterface
AesDataPluginInterface AesDataPluginInterface
PpmDataPluginInterface PpmDataPluginInterface
advancedSymbology advancedSymbology
Qt6::Widgets ${Qt6_Widgets}
) )
endif()
# #
# Data Plugin # Data Plugin
@@ -1,5 +1,20 @@
# CMake script for SymbolEditor # 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 SET(symboleditor_SRCS
asb_save_as_symbol.cpp asb_save_as_symbol.cpp
asb_save_as_symbol.h asb_save_as_symbol.h
@@ -43,6 +58,7 @@ TARGET_INCLUDE_DIRECTORIES(AsbSymEditGuiPlugin PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/../../../../Viewer/SituationMap ${CMAKE_CURRENT_SOURCE_DIR}/../../../../Viewer/SituationMap
${CMAKE_CURRENT_SOURCE_DIR}/../../../../Viewer/SituationMap/Symbology ${CMAKE_CURRENT_SOURCE_DIR}/../../../../Viewer/SituationMap/Symbology
) )
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(AsbSymEditGuiPlugin NGL_TARGET_LINK_LIBRARIES(AsbSymEditGuiPlugin
NGLLogger NGLLogger
LtsWidgets LtsWidgets
@@ -54,7 +70,8 @@ NGL_TARGET_LINK_LIBRARIES(AsbSymEditGuiPlugin
LtsSessionData LtsSessionData
LtsUtilsGuiDds LtsUtilsGuiDds
Qt6::Core Qt6::Core
Qt6::Gui ${Qt6_Gui}
Qt6::Widgets ${Qt6_Widgets}
) )
endif()
NGL_INSTALL_TARGET(AsbSymEditGuiPlugin) NGL_INSTALL_TARGET(AsbSymEditGuiPlugin)
@@ -23,6 +23,7 @@ TARGET_INCLUDE_DIRECTORIES(AsbSymbolProxyGuiPlugin PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/../../../../Viewer/SituationMap ${CMAKE_CURRENT_SOURCE_DIR}/../../../../Viewer/SituationMap
${CMAKE_CURRENT_SOURCE_DIR}/../../../../Viewer/SituationMap/Symbology ${CMAKE_CURRENT_SOURCE_DIR}/../../../../Viewer/SituationMap/Symbology
) )
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(AsbSymbolProxyGuiPlugin NGL_TARGET_LINK_LIBRARIES(AsbSymbolProxyGuiPlugin
AsbSymbolProxyGuiPluginInterface AsbSymbolProxyGuiPluginInterface
NGLLogger NGLLogger
@@ -35,6 +36,7 @@ NGL_TARGET_LINK_LIBRARIES(AsbSymbolProxyGuiPlugin
OpmDataPluginInterface OpmDataPluginInterface
advancedSymbology advancedSymbology
) )
endif()
NGL_INSTALL_TARGET(AsbSymbolProxyGuiPlugin) NGL_INSTALL_TARGET(AsbSymbolProxyGuiPlugin)
@@ -5,6 +5,14 @@
# Created by Christian Ehrlicher, SLSE, 2017-11-01 # 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 SET(tmsr_SRCS
table_model_symbol_renderer_base.cpp table_model_symbol_renderer_base.cpp
table_model_symbol_renderer_base.h table_model_symbol_renderer_base.h
@@ -16,11 +24,13 @@ NGL_TARGET_INCLUDE_DIRECTORIES(AsbHelper
${CMAKE_CURRENT_SOURCE_DIR}/../ ${CMAKE_CURRENT_SOURCE_DIR}/../
${CMAKE_SOURCE_DIR}/Lts/Viewer/SituationMap/ ${CMAKE_SOURCE_DIR}/Lts/Viewer/SituationMap/
) )
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(AsbHelper NGL_TARGET_LINK_LIBRARIES(AsbHelper
PUBLIC PUBLIC
Qt6::Core Qt6::Core
PRIVATE PRIVATE
Qt6::Gui ${Qt6_Gui}
AsbDataPluginInterface AsbDataPluginInterface
NGLLogger NGLLogger
) )
endif()
@@ -8,6 +8,14 @@
# #
# Data Plugin # 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) IF(BUILD_RTI)
SET(alarm_common_gui_SRCS SET(alarm_common_gui_SRCS
alm_history_alarm_model.cpp 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_ADD_LIBRARY2(WS AlmCommon SHARED ${alarm_common_gui_SRCS} )
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(AlmCommon NGL_TARGET_LINK_LIBRARIES(AlmCommon
PRIVATE PRIVATE
Qt6::Widgets ${Qt6_Widgets}
LtsSession LtsSession
LtsSessionData LtsSessionData
LtsCoordTrans LtsCoordTrans
@@ -35,6 +44,7 @@ NGL_TARGET_LINK_LIBRARIES(AlmCommon
ngltools ngltools
svcGnaCommon svcGnaCommon
) )
endif()
NGL_TARGET_INCLUDE_DIRECTORIES(AlmCommon NGL_TARGET_INCLUDE_DIRECTORIES(AlmCommon
PUBLIC PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../../Proxies/GuezNasat/ ${CMAKE_CURRENT_SOURCE_DIR}/../../Proxies/GuezNasat/
@@ -5,6 +5,14 @@
# Created by Patric Karwat, SLSE, 2016-10-05 # 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 SET(alm_config_alarm_gui_SRCS
alm_config_alarm_gui_plugin.cpp alm_config_alarm_gui_plugin.cpp
@@ -21,6 +29,7 @@ NGL_WRAP_UI(alm_config_alarm_gui_SRCS
) )
NGL_ADD_LIBRARY(WS AlmConfigAlarmGuiPlugin MODULE ${alm_config_alarm_gui_SRCS}) NGL_ADD_LIBRARY(WS AlmConfigAlarmGuiPlugin MODULE ${alm_config_alarm_gui_SRCS})
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(AlmConfigAlarmGuiPlugin NGL_TARGET_LINK_LIBRARIES(AlmConfigAlarmGuiPlugin
LtsPrinting LtsPrinting
AlmCommon AlmCommon
@@ -32,7 +41,7 @@ NGL_TARGET_LINK_LIBRARIES(AlmConfigAlarmGuiPlugin
$<IF:$<TARGET_EXISTS:svcPdmCommon>,svcPdmCommon,> # pdm_enums.h in alm_dialog.cpp $<IF:$<TARGET_EXISTS:svcPdmCommon>,svcPdmCommon,> # pdm_enums.h in alm_dialog.cpp
svcPpmCommon svcPpmCommon
GuiPluginInterface GuiPluginInterface
Qt6::Widgets ${Qt6_Widgets}
LtsCoordTrans LtsCoordTrans
LtsWidgets LtsWidgets
LtsDataView LtsDataView
@@ -41,5 +50,6 @@ NGL_TARGET_LINK_LIBRARIES(AlmConfigAlarmGuiPlugin
LtsUtilsGuiDds LtsUtilsGuiDds
LtsAppManager # get sessions to look on which one to open alarm history LtsAppManager # get sessions to look on which one to open alarm history
) )
endif()
NGL_INSTALL_TARGET(AlmConfigAlarmGuiPlugin) NGL_INSTALL_TARGET(AlmConfigAlarmGuiPlugin)
@@ -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 SET(alm_online_reports_gui_SRCS
alm_participant_model.h alm_participant_model.h
alm_participant_model.cpp alm_participant_model.cpp
@@ -26,6 +34,7 @@ NGL_WRAP_UI (alm_online_reports_gui_SRCS
) )
NGL_ADD_LIBRARY(WS AlmOnlineReportsGuiPlugin MODULE ${alm_online_reports_gui_SRCS}) NGL_ADD_LIBRARY(WS AlmOnlineReportsGuiPlugin MODULE ${alm_online_reports_gui_SRCS})
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(AlmOnlineReportsGuiPlugin NGL_TARGET_LINK_LIBRARIES(AlmOnlineReportsGuiPlugin
LtsPrinting LtsPrinting
LtsSession LtsSession
@@ -35,11 +44,12 @@ NGL_TARGET_LINK_LIBRARIES(AlmOnlineReportsGuiPlugin
$<IF:$<TARGET_EXISTS:svcPdmCommon>,svcPdmCommon,> # pdm_translation.h in alm_dialog.cpp $<IF:$<TARGET_EXISTS:svcPdmCommon>,svcPdmCommon,> # pdm_translation.h in alm_dialog.cpp
svcAesCommon svcAesCommon
GuiPluginInterface GuiPluginInterface
Qt6::Widgets ${Qt6_Widgets}
PpmCommon PpmCommon
AlmCommon AlmCommon
LtsUtilsGuiDds LtsUtilsGuiDds
LtsUtilsSettings LtsUtilsSettings
) )
endif()
NGL_INSTALL_TARGET(AlmOnlineReportsGuiPlugin) NGL_INSTALL_TARGET(AlmOnlineReportsGuiPlugin)
@@ -5,6 +5,14 @@
# Created by Patric Karwat, SLSE, 2016-10-05 # 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 SET(alm_emergency_call_gui_SRCS
alm_emergency_call_gui_plugin.cpp alm_emergency_call_gui_plugin.cpp
@@ -23,6 +31,7 @@ NGL_WRAP_UI(alm_emergency_call_gui_SRCS
) )
NGL_ADD_LIBRARY(WS AlmEmergencyCallGuiPlugin MODULE ${alm_emergency_call_gui_SRCS}) NGL_ADD_LIBRARY(WS AlmEmergencyCallGuiPlugin MODULE ${alm_emergency_call_gui_SRCS})
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(AlmEmergencyCallGuiPlugin NGL_TARGET_LINK_LIBRARIES(AlmEmergencyCallGuiPlugin
LtsPrinting LtsPrinting
AlmCommon AlmCommon
@@ -38,7 +47,7 @@ NGL_TARGET_LINK_LIBRARIES(AlmEmergencyCallGuiPlugin
#svcPdmCommon # pdm_enums.h in alm_dialog.cpp #svcPdmCommon # pdm_enums.h in alm_dialog.cpp
#svcPpmCommon #svcPpmCommon
GuiPluginInterface GuiPluginInterface
Qt6::Widgets ${Qt6_Widgets}
LtsCoordTrans LtsCoordTrans
LtsWidgets LtsWidgets
LtsDataView LtsDataView
@@ -47,5 +56,6 @@ NGL_TARGET_LINK_LIBRARIES(AlmEmergencyCallGuiPlugin
LtsUtilsGuiDds LtsUtilsGuiDds
LtsAppManager # get sessions to look on which one to open alarm history LtsAppManager # get sessions to look on which one to open alarm history
) )
endif()
NGL_INSTALL_TARGET(AlmEmergencyCallGuiPlugin) NGL_INSTALL_TARGET(AlmEmergencyCallGuiPlugin)
@@ -6,22 +6,32 @@
# Created by Mike Wille, SLSE, 2016-11-03 # 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 SET(AppStarterGuiPlugin_SRCS
app_gui_plugin.h app_gui_plugin.h
app_gui_plugin.cpp app_gui_plugin.cpp
) )
NGL_ADD_LIBRARY(WS AppStarterGuiPlugin MODULE ${AppStarterGuiPlugin_SRCS}) NGL_ADD_LIBRARY(WS AppStarterGuiPlugin MODULE ${AppStarterGuiPlugin_SRCS})
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(AppStarterGuiPlugin NGL_TARGET_LINK_LIBRARIES(AppStarterGuiPlugin
LtsSession LtsSession
AppGuiPluginInterface AppGuiPluginInterface
LtsAppManager LtsAppManager
LtsAppDescriptor LtsAppDescriptor
Qt6::Widgets ${Qt6_Widgets}
LtsWidgets LtsWidgets
LtsSessionData LtsSessionData
LtsUtilsSettings LtsUtilsSettings
$<IF:$<TARGET_EXISTS:svcIsmCommon>,svcIsmCommon,> # for DbAdmin right $<IF:$<TARGET_EXISTS:svcIsmCommon>,svcIsmCommon,> # for DbAdmin right
) )
endif()
NGL_INSTALL_TARGET(AppStarterGuiPlugin) NGL_INSTALL_TARGET(AppStarterGuiPlugin)
@@ -4,6 +4,14 @@
# $Author$ # $Author$
# Created by hjl, SLSE, 2017-03-22 # 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 SET(aes_info_gui_SRCS
aes_info_gui_plugin.h aes_info_gui_plugin.h
aes_info_gui_plugin.cpp aes_info_gui_plugin.cpp
@@ -22,6 +30,7 @@ NGL_WRAP_UI(aes_info_gui_SRCS
) )
NGL_ADD_LIBRARY(WS AesInfoGuiPlugin MODULE ${aes_info_gui_SRCS}) NGL_ADD_LIBRARY(WS AesInfoGuiPlugin MODULE ${aes_info_gui_SRCS})
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(AesInfoGuiPlugin NGL_TARGET_LINK_LIBRARIES(AesInfoGuiPlugin
AesInfoGuiPluginInterface AesInfoGuiPluginInterface
NGLLogger NGLLogger
@@ -35,7 +44,7 @@ NGL_TARGET_LINK_LIBRARIES(AesInfoGuiPlugin
AesMineAreaGuiPluginInterface AesMineAreaGuiPluginInterface
AesDangerAreaGuiPluginInterface AesDangerAreaGuiPluginInterface
SituationMapGuiPluginInterface SituationMapGuiPluginInterface
Qt6::Widgets ${Qt6_Widgets}
LtsWidgets LtsWidgets
LtsSession LtsSession
LtsSessionData LtsSessionData
@@ -44,5 +53,6 @@ NGL_TARGET_LINK_LIBRARIES(AesInfoGuiPlugin
LtsCoordTrans LtsCoordTrans
ngltools ngltools
) )
endif()
NGL_INSTALL_TARGET(AesInfoGuiPlugin) NGL_INSTALL_TARGET(AesInfoGuiPlugin)
@@ -5,6 +5,14 @@
# Created by hjl, SLSE, 2017-06-06 # 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( ADD_INTERFACE_LIBRARY(
AesAirSupportGuiPluginInterface AesAirSupportGuiPluginInterface
${CMAKE_CURRENT_SOURCE_DIR}/aes_air_support_gui_plugin_interface.h ${CMAKE_CURRENT_SOURCE_DIR}/aes_air_support_gui_plugin_interface.h
@@ -33,6 +41,7 @@ NGL_WRAP_UI(aes_air_support_impact_gui_SRCS
) )
NGL_ADD_LIBRARY(WS AesAirSupportGuiPlugin MODULE ${aes_air_support_impact_gui_SRCS}) NGL_ADD_LIBRARY(WS AesAirSupportGuiPlugin MODULE ${aes_air_support_impact_gui_SRCS})
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(AesAirSupportGuiPlugin NGL_TARGET_LINK_LIBRARIES(AesAirSupportGuiPlugin
AesBaseGui AesBaseGui
AesAirSupportGuiPluginInterface AesAirSupportGuiPluginInterface
@@ -50,7 +59,8 @@ NGL_TARGET_LINK_LIBRARIES(AesAirSupportGuiPlugin
ngltools ngltools
PpmDataPluginInterface PpmDataPluginInterface
SituationMapGuiPluginInterface SituationMapGuiPluginInterface
Qt6::Widgets ${Qt6_Widgets}
) )
endif()
NGL_INSTALL_TARGET(AesAirSupportGuiPlugin) NGL_INSTALL_TARGET(AesAirSupportGuiPlugin)
@@ -5,6 +5,14 @@
# Created by Patric Karwat, SLSE, 2016-07-03 # 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( ADD_INTERFACE_LIBRARY(
AesBCContaminationGuiPluginInterface AesBCContaminationGuiPluginInterface
${CMAKE_CURRENT_SOURCE_DIR}/aes_bccontamination_gui_plugin_interface.h ${CMAKE_CURRENT_SOURCE_DIR}/aes_bccontamination_gui_plugin_interface.h
@@ -33,6 +41,7 @@ NGL_WRAP_UI(aes_bccontamination_gui_SRCS
) )
NGL_ADD_LIBRARY(WS AesBcContaminationGuiPlugin MODULE ${aes_bccontamination_gui_SRCS}) NGL_ADD_LIBRARY(WS AesBcContaminationGuiPlugin MODULE ${aes_bccontamination_gui_SRCS})
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(AesBcContaminationGuiPlugin NGL_TARGET_LINK_LIBRARIES(AesBcContaminationGuiPlugin
AesBaseGui AesBaseGui
AesBCContaminationGuiPluginInterface AesBCContaminationGuiPluginInterface
@@ -42,10 +51,11 @@ NGL_TARGET_LINK_LIBRARIES(AesBcContaminationGuiPlugin
LtsSession LtsSession
AesDataPluginInterface AesDataPluginInterface
AesInfoGuiPluginInterface AesInfoGuiPluginInterface
Qt6::Widgets ${Qt6_Widgets}
LtsWidgets LtsWidgets
LtsUtilsSettings LtsUtilsSettings
) )
endif()
NGL_INSTALL_TARGET(AesBcContaminationGuiPlugin) NGL_INSTALL_TARGET(AesBcContaminationGuiPlugin)
@@ -6,6 +6,14 @@
# Created by Malte Diers, SLSE, 2017-02-13 # 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 SET(aes_base_gui_SRCS
aes_base_edit.cpp aes_base_edit.cpp
aes_base_edit.h aes_base_edit.h
@@ -32,6 +40,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(AesBaseGui
PUBLIC PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../../../Services/ ${CMAKE_CURRENT_SOURCE_DIR}/../../../Services/
) )
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(AesBaseGui NGL_TARGET_LINK_LIBRARIES(AesBaseGui
PRIVATE PRIVATE
ExmDataPluginInterface ExmDataPluginInterface
@@ -50,7 +59,8 @@ NGL_TARGET_LINK_LIBRARIES(AesBaseGui
LtsSessionData LtsSessionData
LtsUtilsGuiDds LtsUtilsGuiDds
LtsWidgets LtsWidgets
Qt6::Widgets ${Qt6_Widgets}
) )
endif()
NGL_INSTALL_TARGET(AesBaseGui) NGL_INSTALL_TARGET(AesBaseGui)
@@ -5,6 +5,14 @@
# Created by hjl, SLSE, 2017-06-06 # 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( ADD_INTERFACE_LIBRARY(
AesBorderlineGuiPluginInterface AesBorderlineGuiPluginInterface
${CMAKE_CURRENT_SOURCE_DIR}/aes_borderline_gui_plugin_interface.h ${CMAKE_CURRENT_SOURCE_DIR}/aes_borderline_gui_plugin_interface.h
@@ -31,6 +39,7 @@ NGL_WRAP_UI(aes_borderline_gui_SRCS
) )
NGL_ADD_LIBRARY(WS AesBorderlineGuiPlugin MODULE ${aes_borderline_gui_SRCS}) NGL_ADD_LIBRARY(WS AesBorderlineGuiPlugin MODULE ${aes_borderline_gui_SRCS})
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(AesBorderlineGuiPlugin NGL_TARGET_LINK_LIBRARIES(AesBorderlineGuiPlugin
AesBaseGui AesBaseGui
AesBorderlineGuiPluginInterface AesBorderlineGuiPluginInterface
@@ -40,7 +49,7 @@ NGL_TARGET_LINK_LIBRARIES(AesBorderlineGuiPlugin
AesInfoGuiPluginInterface AesInfoGuiPluginInterface
FlmDataPluginInterface FlmDataPluginInterface
NGLLogger NGLLogger
Qt6::Widgets ${Qt6_Widgets}
LtsWidgets LtsWidgets
LtsSession LtsSession
LtsSessionData LtsSessionData
@@ -49,5 +58,6 @@ NGL_TARGET_LINK_LIBRARIES(AesBorderlineGuiPlugin
LtsUtilsGuiDds LtsUtilsGuiDds
LtsUtilsSettings LtsUtilsSettings
) )
endif()
NGL_INSTALL_TARGET(AesBorderlineGuiPlugin) NGL_INSTALL_TARGET(AesBorderlineGuiPlugin)
@@ -5,6 +5,14 @@
# Created by Malte Diers, SLSE, 2016-07-03 # 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 SET(aes_charge_administration_gui_SRCS
aes_charge_administration_gui_plugin.cpp aes_charge_administration_gui_plugin.cpp
aes_charge_administration_gui_plugin.h aes_charge_administration_gui_plugin.h
@@ -29,6 +37,7 @@ NGL_WRAP_UI(aes_charge_administration_gui_SRCS
) )
NGL_ADD_LIBRARY(WS AesChargeAdministrationGuiPlugin MODULE ${aes_charge_administration_gui_SRCS}) NGL_ADD_LIBRARY(WS AesChargeAdministrationGuiPlugin MODULE ${aes_charge_administration_gui_SRCS})
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(AesChargeAdministrationGuiPlugin NGL_TARGET_LINK_LIBRARIES(AesChargeAdministrationGuiPlugin
LtsPrinting LtsPrinting
AesBaseGui AesBaseGui
@@ -40,9 +49,10 @@ NGL_TARGET_LINK_LIBRARIES(AesChargeAdministrationGuiPlugin
AesDataPluginInterface AesDataPluginInterface
PpmGuiComboboxPluginInterface PpmGuiComboboxPluginInterface
$<IF:$<TARGET_EXISTS:svcPdmCommon>,svcPdmCommon,> $<IF:$<TARGET_EXISTS:svcPdmCommon>,svcPdmCommon,>
Qt6::Widgets ${Qt6_Widgets}
LtsWidgets LtsWidgets
LtsUtilsSettings LtsUtilsSettings
) )
endif()
NGL_INSTALL_TARGET(AesChargeAdministrationGuiPlugin) NGL_INSTALL_TARGET(AesChargeAdministrationGuiPlugin)
@@ -5,6 +5,14 @@
# Created by Malte Diers, SLSE, 2017-04-06 # 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( ADD_INTERFACE_LIBRARY(
AesChargeEffectGuiPluginInterface AesChargeEffectGuiPluginInterface
${CMAKE_CURRENT_SOURCE_DIR}/aes_charge_effect_gui_plugin_interface.h ${CMAKE_CURRENT_SOURCE_DIR}/aes_charge_effect_gui_plugin_interface.h
@@ -23,6 +31,7 @@ NGL_WRAP_UI(aes_charge_effect_gui_SRCS
) )
NGL_ADD_LIBRARY(WS AesChargeEffectGuiPlugin MODULE ${aes_charge_effect_gui_SRCS}) NGL_ADD_LIBRARY(WS AesChargeEffectGuiPlugin MODULE ${aes_charge_effect_gui_SRCS})
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(AesChargeEffectGuiPlugin NGL_TARGET_LINK_LIBRARIES(AesChargeEffectGuiPlugin
AesBaseGui AesBaseGui
AesChargeEffectGuiPluginInterface AesChargeEffectGuiPluginInterface
@@ -33,12 +42,13 @@ NGL_TARGET_LINK_LIBRARIES(AesChargeEffectGuiPlugin
PpmGuiComboboxPluginInterface PpmGuiComboboxPluginInterface
PpmDataPluginInterface PpmDataPluginInterface
PpmParticipantSelectionGui PpmParticipantSelectionGui
Qt6::Widgets ${Qt6_Widgets}
LtsWidgets LtsWidgets
AsbDataPluginInterface AsbDataPluginInterface
advancedSymbologyGui advancedSymbologyGui
LtsUtilsSettings LtsUtilsSettings
) )
endif()
NGL_INSTALL_TARGET(AesChargeEffectGuiPlugin) NGL_INSTALL_TARGET(AesChargeEffectGuiPlugin)
@@ -5,6 +5,14 @@
# Created by Patric Karwat, SLSE, 2016-07-03 # 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( ADD_INTERFACE_LIBRARY(
AesDangerAreaGuiPluginInterface AesDangerAreaGuiPluginInterface
${CMAKE_CURRENT_SOURCE_DIR}/aes_danger_area_gui_plugin_interface.h ${CMAKE_CURRENT_SOURCE_DIR}/aes_danger_area_gui_plugin_interface.h
@@ -30,6 +38,7 @@ NGL_WRAP_UI(aes_danger_area_gui_SRCS
) )
NGL_ADD_LIBRARY2(WS AesDangerAreaGuiPlugin MODULE ${aes_danger_area_gui_SRCS}) NGL_ADD_LIBRARY2(WS AesDangerAreaGuiPlugin MODULE ${aes_danger_area_gui_SRCS})
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(AesDangerAreaGuiPlugin NGL_TARGET_LINK_LIBRARIES(AesDangerAreaGuiPlugin
AesBaseGui AesBaseGui
ngltools # dtg ngltools # dtg
@@ -40,10 +49,11 @@ NGL_TARGET_LINK_LIBRARIES(AesDangerAreaGuiPlugin
PdmGuiPluginInterface PdmGuiPluginInterface
AesInfoGuiPluginInterface AesInfoGuiPluginInterface
SituationMapGuiPluginInterface SituationMapGuiPluginInterface
Qt6::Widgets ${Qt6_Widgets}
LtsWidgets LtsWidgets
LtsDataView LtsDataView
LtsUtilsGuiDds LtsUtilsGuiDds
LtsUtilsSettings LtsUtilsSettings
) )
endif()
@@ -8,6 +8,14 @@
# #
# LIBRARY for AesEffectClusterModel (which is used at AirSupportPlugin) # 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 SET(AesEffectCluster_SRCS
aes_effect_cluster_model.cpp aes_effect_cluster_model.cpp
aes_effect_cluster_model.h aes_effect_cluster_model.h
@@ -83,6 +91,7 @@ NGL_WRAP_UI(aes_explosion_gui_SRCS
) )
NGL_ADD_LIBRARY(WS AesExplosionGuiPlugin MODULE ${aes_explosion_gui_SRCS}) NGL_ADD_LIBRARY(WS AesExplosionGuiPlugin MODULE ${aes_explosion_gui_SRCS})
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(AesExplosionGuiPlugin NGL_TARGET_LINK_LIBRARIES(AesExplosionGuiPlugin
AesBaseGui AesBaseGui
ngltools ngltools
@@ -96,7 +105,7 @@ NGL_TARGET_LINK_LIBRARIES(AesExplosionGuiPlugin
PpmParticipantSelectionGui PpmParticipantSelectionGui
SituationMapGuiPluginInterface SituationMapGuiPluginInterface
Qt6::Widgets ${Qt6_Widgets}
LtsWidgets LtsWidgets
LtsDataView LtsDataView
LtsUtilsGuiDds LtsUtilsGuiDds
@@ -110,6 +119,7 @@ NGL_TARGET_LINK_LIBRARIES(AesExplosionGuiPlugin
ExmDataPluginInterface ExmDataPluginInterface
saaTelegrams saaTelegrams
) )
endif()
NGL_INSTALL_TARGET(AesExplosionGuiPlugin) NGL_INSTALL_TARGET(AesExplosionGuiPlugin)
@@ -5,6 +5,14 @@
# Created by Malte Diers, SLSE, 2017-04-06 # 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( ADD_INTERFACE_LIBRARY(
AesFunctionalAreaGuiPluginInterface AesFunctionalAreaGuiPluginInterface
${CMAKE_CURRENT_SOURCE_DIR}/aes_functional_area_gui_plugin_interface.h ${CMAKE_CURRENT_SOURCE_DIR}/aes_functional_area_gui_plugin_interface.h
@@ -30,6 +38,7 @@ NGL_WRAP_UI(aes_functional_area_gui_SRCS
) )
NGL_ADD_LIBRARY(WS AesFunctionalAreaGuiPlugin MODULE ${aes_functional_area_gui_SRCS}) NGL_ADD_LIBRARY(WS AesFunctionalAreaGuiPlugin MODULE ${aes_functional_area_gui_SRCS})
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(AesFunctionalAreaGuiPlugin NGL_TARGET_LINK_LIBRARIES(AesFunctionalAreaGuiPlugin
AesBaseGui AesBaseGui
AesFunctionalAreaGuiPluginInterface AesFunctionalAreaGuiPluginInterface
@@ -40,12 +49,13 @@ NGL_TARGET_LINK_LIBRARIES(AesFunctionalAreaGuiPlugin
PpmGuiComboboxPluginInterface PpmGuiComboboxPluginInterface
PpmDataPluginInterface PpmDataPluginInterface
PpmParticipantSelectionGui PpmParticipantSelectionGui
Qt6::Widgets ${Qt6_Widgets}
LtsWidgets LtsWidgets
AsbDataPluginInterface AsbDataPluginInterface
advancedSymbologyGui advancedSymbologyGui
LtsUtilsSettings LtsUtilsSettings
) )
endif()
NGL_INSTALL_TARGET(AesFunctionalAreaGuiPlugin) NGL_INSTALL_TARGET(AesFunctionalAreaGuiPlugin)
@@ -5,6 +5,14 @@
# Created by hjl, SLSE, 2017-06-06 # 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( ADD_INTERFACE_LIBRARY(
AesGasPipeGuiPluginInterface AesGasPipeGuiPluginInterface
${CMAKE_CURRENT_SOURCE_DIR}/aes_gas_pipe_gui_plugin_interface.h ${CMAKE_CURRENT_SOURCE_DIR}/aes_gas_pipe_gui_plugin_interface.h
@@ -31,6 +39,7 @@ NGL_WRAP_UI(aes_gas_pipe_gui_SRCS
) )
NGL_ADD_LIBRARY(WS AesGasPipeGuiPlugin MODULE ${aes_gas_pipe_gui_SRCS}) NGL_ADD_LIBRARY(WS AesGasPipeGuiPlugin MODULE ${aes_gas_pipe_gui_SRCS})
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(AesGasPipeGuiPlugin NGL_TARGET_LINK_LIBRARIES(AesGasPipeGuiPlugin
AesBaseGui AesBaseGui
AesGasPipeGuiPluginInterface AesGasPipeGuiPluginInterface
@@ -39,7 +48,7 @@ NGL_TARGET_LINK_LIBRARIES(AesGasPipeGuiPlugin
PdmGuiPluginInterface PdmGuiPluginInterface
AesInfoGuiPluginInterface AesInfoGuiPluginInterface
NGLLogger NGLLogger
Qt6::Widgets ${Qt6_Widgets}
LtsWidgets LtsWidgets
LtsSession LtsSession
LtsSessionData LtsSessionData
@@ -48,5 +57,6 @@ NGL_TARGET_LINK_LIBRARIES(AesGasPipeGuiPlugin
LtsUtilsGuiDds LtsUtilsGuiDds
LtsUtilsSettings LtsUtilsSettings
) )
endif()
NGL_INSTALL_TARGET(AesGasPipeGuiPlugin) NGL_INSTALL_TARGET(AesGasPipeGuiPlugin)
@@ -6,6 +6,14 @@
# Created by Mike Wille, SLSE, 2016-09-26 # 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( ADD_INTERFACE_LIBRARY(
AesMineAreaGuiPluginInterface AesMineAreaGuiPluginInterface
${CMAKE_CURRENT_SOURCE_DIR}/aes_mine_area_gui_plugin_interface.h ${CMAKE_CURRENT_SOURCE_DIR}/aes_mine_area_gui_plugin_interface.h
@@ -31,6 +39,7 @@ NGL_WRAP_UI(aes_mine_area_gui_SRCS
) )
NGL_ADD_LIBRARY(WS AesMineAreaGuiPlugin MODULE ${aes_mine_area_gui_SRCS}) NGL_ADD_LIBRARY(WS AesMineAreaGuiPlugin MODULE ${aes_mine_area_gui_SRCS})
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(AesMineAreaGuiPlugin NGL_TARGET_LINK_LIBRARIES(AesMineAreaGuiPlugin
AesBaseGui AesBaseGui
NGLLogger NGLLogger
@@ -40,12 +49,13 @@ NGL_TARGET_LINK_LIBRARIES(AesMineAreaGuiPlugin
AesMineAreaGuiPluginInterface AesMineAreaGuiPluginInterface
PdmGuiPluginInterface PdmGuiPluginInterface
SituationMapGuiPluginInterface SituationMapGuiPluginInterface
Qt6::Widgets ${Qt6_Widgets}
LtsWidgets LtsWidgets
LtsUtilsGuiDds LtsUtilsGuiDds
LtsDataView LtsDataView
ngltools ngltools
LtsUtilsSettings LtsUtilsSettings
) )
endif()
NGL_INSTALL_TARGET(AesMineAreaGuiPlugin) NGL_INSTALL_TARGET(AesMineAreaGuiPlugin)
@@ -5,6 +5,14 @@
# Created by Patric Karwat, SLSE, 2016-07-03 # 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( ADD_INTERFACE_LIBRARY(
AesMineCorridorGuiPluginInterface AesMineCorridorGuiPluginInterface
${CMAKE_CURRENT_SOURCE_DIR}/aes_mine_corridor_gui_plugin_interface.h ${CMAKE_CURRENT_SOURCE_DIR}/aes_mine_corridor_gui_plugin_interface.h
@@ -30,6 +38,7 @@ NGL_WRAP_UI(aes_mine_corridor_gui_SRCS
) )
NGL_ADD_LIBRARY2(WS AesMineCorridorGuiPlugin MODULE ${aes_mine_corridor_gui_SRCS}) NGL_ADD_LIBRARY2(WS AesMineCorridorGuiPlugin MODULE ${aes_mine_corridor_gui_SRCS})
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(AesMineCorridorGuiPlugin NGL_TARGET_LINK_LIBRARIES(AesMineCorridorGuiPlugin
AesBaseGui AesBaseGui
ngltools # dtg ngltools # dtg
@@ -40,10 +49,11 @@ NGL_TARGET_LINK_LIBRARIES(AesMineCorridorGuiPlugin
AesInfoGuiPluginInterface AesInfoGuiPluginInterface
PpmGuiComboboxPluginInterface PpmGuiComboboxPluginInterface
SituationMapGuiPluginInterface SituationMapGuiPluginInterface
Qt6::Widgets ${Qt6_Widgets}
LtsWidgets LtsWidgets
LtsDataView LtsDataView
LtsUtilsGuiDds LtsUtilsGuiDds
LtsUtilsSettings LtsUtilsSettings
) )
endif()
@@ -5,6 +5,14 @@
# Created by Patric Karwat, SLSE, 2016-07-03 # 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( ADD_INTERFACE_LIBRARY(
AesMineSingleVirtualGuiPluginInterface AesMineSingleVirtualGuiPluginInterface
${CMAKE_CURRENT_SOURCE_DIR}/aes_mine_single_virtual_gui_plugin_interface.h ${CMAKE_CURRENT_SOURCE_DIR}/aes_mine_single_virtual_gui_plugin_interface.h
@@ -46,6 +54,7 @@ NGL_WRAP_UI(aes_mine_single_virtual_gui_SRCS
) )
NGL_ADD_LIBRARY(WS AesMineSingleVirtualGuiPlugin MODULE ${aes_mine_single_virtual_gui_SRCS}) NGL_ADD_LIBRARY(WS AesMineSingleVirtualGuiPlugin MODULE ${aes_mine_single_virtual_gui_SRCS})
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(AesMineSingleVirtualGuiPlugin NGL_TARGET_LINK_LIBRARIES(AesMineSingleVirtualGuiPlugin
AesBaseGui AesBaseGui
AesMineSingleVirtualGuiPluginInterface AesMineSingleVirtualGuiPluginInterface
@@ -55,10 +64,11 @@ NGL_TARGET_LINK_LIBRARIES(AesMineSingleVirtualGuiPlugin
LtsSession LtsSession
AesDataPluginInterface AesDataPluginInterface
AesInfoGuiPluginInterface AesInfoGuiPluginInterface
Qt6::Widgets ${Qt6_Widgets}
LtsWidgets LtsWidgets
LtsUtilsSettings LtsUtilsSettings
) )
endif()
NGL_INSTALL_TARGET(AesMineSingleVirtualGuiPlugin) NGL_INSTALL_TARGET(AesMineSingleVirtualGuiPlugin)
@@ -5,6 +5,14 @@
# Created by Patric Karwat, SLSE, 2016-07-03 # 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( ADD_INTERFACE_LIBRARY(
AesNContaminationGuiPluginInterface AesNContaminationGuiPluginInterface
${CMAKE_CURRENT_SOURCE_DIR}/aes_ncontamination_gui_plugin_interface.h ${CMAKE_CURRENT_SOURCE_DIR}/aes_ncontamination_gui_plugin_interface.h
@@ -30,6 +38,7 @@ NGL_WRAP_UI(aes_ncontamination_gui_SRCS
) )
NGL_ADD_LIBRARY(WS AesNContaminationGuiPlugin MODULE ${aes_ncontamination_gui_SRCS}) NGL_ADD_LIBRARY(WS AesNContaminationGuiPlugin MODULE ${aes_ncontamination_gui_SRCS})
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(AesNContaminationGuiPlugin NGL_TARGET_LINK_LIBRARIES(AesNContaminationGuiPlugin
AesBaseGui AesBaseGui
ngltools # dtg ngltools # dtg
@@ -39,12 +48,13 @@ NGL_TARGET_LINK_LIBRARIES(AesNContaminationGuiPlugin
AesNContaminationGuiPluginInterface AesNContaminationGuiPluginInterface
PpmGuiComboboxPluginInterface PpmGuiComboboxPluginInterface
SituationMapGuiPluginInterface SituationMapGuiPluginInterface
Qt6::Widgets ${Qt6_Widgets}
LtsWidgets LtsWidgets
LtsDataView LtsDataView
LtsUtilsGuiDds LtsUtilsGuiDds
LtsUtilsSettings LtsUtilsSettings
) )
endif()
NGL_INSTALL_TARGET(AesNContaminationGuiPlugin) NGL_INSTALL_TARGET(AesNContaminationGuiPlugin)
@@ -5,6 +5,14 @@
# Created by Malte Diers, SLSE, 2017-04-06 # 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( ADD_INTERFACE_LIBRARY(
AesTechnicalAreaGuiPluginInterface AesTechnicalAreaGuiPluginInterface
${CMAKE_CURRENT_SOURCE_DIR}/aes_technical_area_gui_plugin_interface.h ${CMAKE_CURRENT_SOURCE_DIR}/aes_technical_area_gui_plugin_interface.h
@@ -30,6 +38,7 @@ NGL_WRAP_UI(aes_technical_area_gui_SRCS
) )
NGL_ADD_LIBRARY(WS AesTechnicalAreaGuiPlugin MODULE ${aes_technical_area_gui_SRCS}) NGL_ADD_LIBRARY(WS AesTechnicalAreaGuiPlugin MODULE ${aes_technical_area_gui_SRCS})
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(AesTechnicalAreaGuiPlugin NGL_TARGET_LINK_LIBRARIES(AesTechnicalAreaGuiPlugin
AesBaseGui AesBaseGui
AesTechnicalAreaGuiPluginInterface AesTechnicalAreaGuiPluginInterface
@@ -37,10 +46,11 @@ NGL_TARGET_LINK_LIBRARIES(AesTechnicalAreaGuiPlugin
NGLLogger NGLLogger
LtsSessionData LtsSessionData
AesDataPluginInterface AesDataPluginInterface
Qt6::Widgets ${Qt6_Widgets}
LtsWidgets LtsWidgets
LtsUtilsSettings LtsUtilsSettings
) )
endif()
NGL_INSTALL_TARGET(AesTechnicalAreaGuiPlugin) NGL_INSTALL_TARGET(AesTechnicalAreaGuiPlugin)
@@ -5,6 +5,14 @@
# Created by Christian Ehrlicher, SLSE, 2016-02-29 # 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 SET(asm_gui_SRCS
asm_training_area_dialog.cpp asm_training_area_dialog.cpp
asm_training_area_dialog.h asm_training_area_dialog.h
@@ -22,6 +30,7 @@ NGL_WRAP_UI(asm_gui_SRCS
) )
NGL_ADD_LIBRARY(WS AsmGuiPlugin MODULE ${asm_gui_SRCS}) NGL_ADD_LIBRARY(WS AsmGuiPlugin MODULE ${asm_gui_SRCS})
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(AsmGuiPlugin NGL_TARGET_LINK_LIBRARIES(AsmGuiPlugin
ngltools # dtg ngltools # dtg
NGLLogger NGLLogger
@@ -31,7 +40,7 @@ NGL_TARGET_LINK_LIBRARIES(AsmGuiPlugin
OpmDataPluginInterface OpmDataPluginInterface
AsmGuiPluginInterface AsmGuiPluginInterface
FlmDataPluginInterface FlmDataPluginInterface
Qt6::Widgets ${Qt6_Widgets}
LtsCoordTrans LtsCoordTrans
ltsCoordWidget ltsCoordWidget
LtsWidgets LtsWidgets
@@ -42,6 +51,7 @@ NGL_TARGET_LINK_LIBRARIES(AsmGuiPlugin
ProjectConfig ProjectConfig
LtsUtilsGuiConnectDialog LtsUtilsGuiConnectDialog
) )
endif()
NGL_INSTALL_TARGET(AsmGuiPlugin) NGL_INSTALL_TARGET(AsmGuiPlugin)
@@ -6,9 +6,9 @@
# #
IF(${CMAKE_VERSION} VERSION_LESS "3.6.0") 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() ELSE()
FIND_PACKAGE(Boost REQUIRED) FIND_PACKAGE(Boost)
ENDIF() ENDIF()
ADD_SUBDIRECTORY(Data) ADD_SUBDIRECTORY(Data)
@@ -22,7 +22,7 @@ ADD_SUBDIRECTORY(Shared)
ADD_INTERFACE_LIBRARY(AvmMenuEditGuiPluginInterface ADD_INTERFACE_LIBRARY(AvmMenuEditGuiPluginInterface
${CMAKE_CURRENT_SOURCE_DIR}/avm_menu_edit_gui_plugin_interface.h ${CMAKE_CURRENT_SOURCE_DIR}/avm_menu_edit_gui_plugin_interface.h
${CMAKE_CURRENT_SOURCE_DIR}/.. ${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,>
) )
# #
@@ -41,6 +41,6 @@ NGL_TARGET_LINK_LIBRARIES(AvmDataPlugin
LtsUtilsGuiStyleManager LtsUtilsGuiStyleManager
LtsUtilsGuiConnectDialog LtsUtilsGuiConnectDialog
LtsUtilsSettings LtsUtilsSettings
Boost::boost $<IF:$<TARGET_EXISTS:Boost::boost>,Boost::boost,>
) )
NGL_INSTALL_TARGET(AvmDataPlugin) NGL_INSTALL_TARGET(AvmDataPlugin)
@@ -5,6 +5,14 @@
# Created by Patric Karwat, SLSE, 2016-10-05 # 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 SET(avm_menu_edit_gui_SRCS
avm_menu_edit_gui_plugin.cpp avm_menu_edit_gui_plugin.cpp
avm_menu_edit_gui_plugin.h avm_menu_edit_gui_plugin.h
@@ -56,6 +64,7 @@ NGL_WRAP_UI(avm_menu_edit_gui_SRCS
) )
NGL_ADD_LIBRARY(WS avmMenuEditGuiPlugin MODULE ${avm_menu_edit_gui_SRCS}) NGL_ADD_LIBRARY(WS avmMenuEditGuiPlugin MODULE ${avm_menu_edit_gui_SRCS})
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(avmMenuEditGuiPlugin NGL_TARGET_LINK_LIBRARIES(avmMenuEditGuiPlugin
AvmDataPluginInterface AvmDataPluginInterface
AvmMenuEditGuiPluginInterface AvmMenuEditGuiPluginInterface
@@ -78,9 +87,10 @@ NGL_TARGET_LINK_LIBRARIES(avmMenuEditGuiPlugin
ngltools ngltools
nglwidgets nglwidgets
OpmDataPluginInterface OpmDataPluginInterface
Qt6::Widgets ${Qt6_Widgets}
TopicEditorBase TopicEditorBase
Boost::boost $<IF:$<TARGET_EXISTS:Boost::boost>,Boost::boost,>
) )
endif()
NGL_INSTALL_TARGET(avmMenuEditGuiPlugin) NGL_INSTALL_TARGET(avmMenuEditGuiPlugin)
@@ -5,6 +5,14 @@
# Created by Hannes Baeuerle, SLSE, 2017-08-18 # 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 SET(avm_combat_net_radio_gui_SRCS
CombatNetRadioConfiguration/avm_cnr_json_helper.h CombatNetRadioConfiguration/avm_cnr_json_helper.h
CombatNetRadioConfiguration/avm_cnr_json_helper.cpp CombatNetRadioConfiguration/avm_cnr_json_helper.cpp
@@ -76,6 +84,7 @@ NGL_WRAP_UI(avm_combat_net_radio_gui_SRCS
) )
NGL_ADD_LIBRARY(WS avmCombatNetRadioGuiPlugin MODULE ${avm_combat_net_radio_gui_SRCS}) NGL_ADD_LIBRARY(WS avmCombatNetRadioGuiPlugin MODULE ${avm_combat_net_radio_gui_SRCS})
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(avmCombatNetRadioGuiPlugin NGL_TARGET_LINK_LIBRARIES(avmCombatNetRadioGuiPlugin
svcCnrHelper svcCnrHelper
LtsPrinting LtsPrinting
@@ -91,11 +100,12 @@ NGL_TARGET_LINK_LIBRARIES(avmCombatNetRadioGuiPlugin
svcAvmCommon svcAvmCommon
AvmShared AvmShared
svcExmClient svcExmClient
Qt6::Widgets ${Qt6_Widgets}
LtsWidgets LtsWidgets
LtsDataView LtsDataView
LtsUtilsGuiDds LtsUtilsGuiDds
LtsUtilsSettings LtsUtilsSettings
) )
endif()
NGL_INSTALL_TARGET(avmCombatNetRadioGuiPlugin) NGL_INSTALL_TARGET(avmCombatNetRadioGuiPlugin)
@@ -5,6 +5,14 @@
# Created by Astrid Mueller, SGAS, 2017-10-17 # 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 SET(avm_eloka_gui_SRCS
avm_eloka_gui_plugin.cpp avm_eloka_gui_plugin.cpp
avm_eloka_gui_plugin.h avm_eloka_gui_plugin.h
@@ -22,6 +30,7 @@ NGL_WRAP_UI(avm_eloka_gui_SRCS
) )
NGL_ADD_LIBRARY(WS AvmElokaGuiPlugin MODULE ${avm_eloka_gui_SRCS}) NGL_ADD_LIBRARY(WS AvmElokaGuiPlugin MODULE ${avm_eloka_gui_SRCS})
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(AvmElokaGuiPlugin NGL_TARGET_LINK_LIBRARIES(AvmElokaGuiPlugin
LtsPrinting LtsPrinting
NGLLogger NGLLogger
@@ -31,11 +40,12 @@ NGL_TARGET_LINK_LIBRARIES(AvmElokaGuiPlugin
AvmDataPluginInterface AvmDataPluginInterface
PpmDataPluginInterface PpmDataPluginInterface
svcAvmCommon svcAvmCommon
Qt6::Widgets ${Qt6_Widgets}
LtsWidgets LtsWidgets
LtsDataView LtsDataView
LtsUtilsGuiDds LtsUtilsGuiDds
ngltools ngltools
) )
endif()
NGL_INSTALL_TARGET(AvmElokaGuiPlugin) NGL_INSTALL_TARGET(AvmElokaGuiPlugin)
@@ -5,6 +5,14 @@
# Created by hjl, SLSE, 2016-12-01 # 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 SET(mvs_gui_SRCS
avm_mvs_video_team_gui_plugin.h avm_mvs_video_team_gui_plugin.h
avm_mvs_video_team_gui_plugin.cpp 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_ADD_LIBRARY(WS MvsVideoTeamGuiPlugin MODULE ${mvs_gui_SRCS})
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(MvsVideoTeamGuiPlugin NGL_TARGET_LINK_LIBRARIES(MvsVideoTeamGuiPlugin
# LtsPrinting # LtsPrinting
Qt6::Widgets ${Qt6_Widgets}
LtsWidgets LtsWidgets
LtsDataView LtsDataView
LtsPrinting LtsPrinting
@@ -46,5 +55,6 @@ NGL_TARGET_LINK_LIBRARIES(MvsVideoTeamGuiPlugin
LtsUtilsGuiDds LtsUtilsGuiDds
LtsUtilsSettings LtsUtilsSettings
) )
endif()
NGL_INSTALL_TARGET(MvsVideoTeamGuiPlugin) NGL_INSTALL_TARGET(MvsVideoTeamGuiPlugin)
@@ -5,6 +5,14 @@
# Created by Hannes Baeuerle, SLSE, 2017-08-18 # 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 SET(avm_tvc_gui_SRCS
avm_training_voice_gui_plugin.cpp avm_training_voice_gui_plugin.cpp
avm_training_voice_gui_plugin.h avm_training_voice_gui_plugin.h
@@ -22,6 +30,7 @@ NGL_WRAP_UI(avm_tvc_gui_SRCS
) )
NGL_ADD_LIBRARY(WS avmTrainingVoiceGuiPlugin MODULE ${avm_tvc_gui_SRCS}) NGL_ADD_LIBRARY(WS avmTrainingVoiceGuiPlugin MODULE ${avm_tvc_gui_SRCS})
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(avmTrainingVoiceGuiPlugin NGL_TARGET_LINK_LIBRARIES(avmTrainingVoiceGuiPlugin
LtsPrinting LtsPrinting
nglwidgets nglwidgets
@@ -34,11 +43,12 @@ NGL_TARGET_LINK_LIBRARIES(avmTrainingVoiceGuiPlugin
svcAvmCommon svcAvmCommon
AvmShared AvmShared
svcExmClient svcExmClient
Qt6::Widgets ${Qt6_Widgets}
LtsWidgets LtsWidgets
LtsDataView LtsDataView
LtsUtilsGuiDds LtsUtilsGuiDds
LtsUtilsSettings LtsUtilsSettings
) )
endif()
NGL_INSTALL_TARGET(avmTrainingVoiceGuiPlugin) NGL_INSTALL_TARGET(avmTrainingVoiceGuiPlugin)
@@ -6,6 +6,14 @@
# Created by Christian Fröbel, NLSE, 2018-04-19 # 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) IF(BUILD_RTI)
set(SRCS set(SRCS
@@ -32,18 +40,20 @@ NGL_TARGET_INCLUDE_DIRECTORIES(AvmShared
${CMAKE_CURRENT_SOURCE_DIR}/../../Services/ ${CMAKE_CURRENT_SOURCE_DIR}/../../Services/
${CMAKE_CURRENT_SOURCE_DIR}/../../Common/ ${CMAKE_CURRENT_SOURCE_DIR}/../../Common/
) )
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(AvmShared NGL_TARGET_LINK_LIBRARIES(AvmShared
PUBLIC PUBLIC
Qt6::Core Qt6::Core
svcAvmCommon svcAvmCommon
Boost::boost $<IF:$<TARGET_EXISTS:Boost::boost>,Boost::boost,>
PRIVATE PRIVATE
LtsMultiMonitor LtsMultiMonitor
LtsUtilsSettings LtsUtilsSettings
Qt6::Gui ${Qt6_Gui}
nglsettings nglsettings
ngltools ngltools
) )
endif()
NGL_INSTALL_TARGET(AvmShared) NGL_INSTALL_TARGET(AvmShared)
ENDIF(BUILD_RTI) ENDIF(BUILD_RTI)
@@ -5,18 +5,28 @@
# Created by Mike Wille, NLS, 2019-01-21 # 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 SET(bat_gui_SRCS
bat_gui_plugin.cpp bat_gui_plugin.cpp
bat_gui_plugin.h bat_gui_plugin.h
) )
NGL_ADD_LIBRARY(WS BatGuiPlugin MODULE ${bat_gui_SRCS}) NGL_ADD_LIBRARY(WS BatGuiPlugin MODULE ${bat_gui_SRCS})
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(BatGuiPlugin NGL_TARGET_LINK_LIBRARIES(BatGuiPlugin
LtsSession LtsSession
BatGuiPluginInterface BatGuiPluginInterface
Qt6::Widgets ${Qt6_Widgets}
LtsNotification LtsNotification
) )
endif()
IF(WIN32) IF(WIN32)
NGL_TARGET_LINK_LIBRARIES(BatGuiPlugin NGL_TARGET_LINK_LIBRARIES(BatGuiPlugin
WLanApi.lib WLanApi.lib
@@ -6,6 +6,21 @@
# Created by Mike Wille, SLSE, 2017-08-17 # 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) FIND_PACKAGE(BgViewer)
IF (BgViewer_FOUND) IF (BgViewer_FOUND)
SET(BgViewer_FOUND TRUE) SET(BgViewer_FOUND TRUE)
@@ -94,6 +109,7 @@ INSTALL_SHARED_FILES(BuildingViewerCommon_SRCS
) )
NGL_ADD_LIBRARY2(WS BuildingViewerCommon SHARED ${BuildingViewerCommon_SRCS}) NGL_ADD_LIBRARY2(WS BuildingViewerCommon SHARED ${BuildingViewerCommon_SRCS})
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(BuildingViewerCommon NGL_TARGET_LINK_LIBRARIES(BuildingViewerCommon
PRIVATE PRIVATE
Qt6::OpenGL Qt6::OpenGL
@@ -103,6 +119,7 @@ NGL_TARGET_LINK_LIBRARIES(BuildingViewerCommon
${OPENTHREADS_LIBRARIES} # FIND_PACKAGE(OpenSceneGraph) ${OPENTHREADS_LIBRARIES} # FIND_PACKAGE(OpenSceneGraph)
${OPENSCENEGRAPH_LIBRARIES} # FIND_PACKAGE(OpenSceneGraph) ${OPENSCENEGRAPH_LIBRARIES} # FIND_PACKAGE(OpenSceneGraph)
) )
endif()
NGL_TARGET_INCLUDE_DIRECTORIES(BuildingViewerCommon NGL_TARGET_INCLUDE_DIRECTORIES(BuildingViewerCommon
PRIVATE PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/BgViewer/dtEntity/ext/RapidXML ${CMAKE_CURRENT_SOURCE_DIR}/BgViewer/dtEntity/ext/RapidXML
@@ -132,14 +149,15 @@ NGL_TARGET_INCLUDE_DIRECTORIES(BuildingViewerCommon
${CMAKE_CURRENT_BINARY_DIR}/../ ${CMAKE_CURRENT_BINARY_DIR}/../
) )
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(BuildingViewerCommon NGL_TARGET_LINK_LIBRARIES(BuildingViewerCommon
PRIVATE PRIVATE
ngltools ngltools
LtsPluginManager LtsPluginManager
PUBLIC PUBLIC
Qt6::Core Qt6::Core
Qt6::Gui ${Qt6_Gui}
Qt6::Widgets ${Qt6_Widgets}
AsbDataPluginInterface AsbDataPluginInterface
AvmDataPluginInterface AvmDataPluginInterface
BldDataPluginInterface BldDataPluginInterface
@@ -157,5 +175,6 @@ NGL_TARGET_LINK_LIBRARIES(BuildingViewerCommon
LtsUtilsSettings LtsUtilsSettings
LtsUtilsGuiDds LtsUtilsGuiDds
) )
endif()
NGL_INSTALL_TARGET(BuildingViewerCommon) NGL_INSTALL_TARGET(BuildingViewerCommon)
@@ -6,6 +6,14 @@
# Created by Mike Wille, SLSE, 2017-05-15 # 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 SET(SRCS
BuildingEdit/bdv_building_edit.cpp BuildingEdit/bdv_building_edit.cpp
BuildingEdit/bdv_building_edit.h BuildingEdit/bdv_building_edit.h
@@ -52,6 +60,7 @@ NGL_WRAP_UI(SRCS
NGL_ADD_LIBRARY(WS BdvViewerGuiPlugin MODULE ${SRCS}) NGL_ADD_LIBRARY(WS BdvViewerGuiPlugin MODULE ${SRCS})
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(BdvViewerGuiPlugin NGL_TARGET_LINK_LIBRARIES(BdvViewerGuiPlugin
BdvViewerGuiPluginInterface BdvViewerGuiPluginInterface
BldDataPluginInterface BldDataPluginInterface
@@ -69,7 +78,7 @@ NGL_TARGET_LINK_LIBRARIES(BdvViewerGuiPlugin
NGLLogger NGLLogger
nglwidgets nglwidgets
Qt6::Core Qt6::Core
Qt6::Widgets ${Qt6_Widgets}
Qt6::Xml Qt6::Xml
TopicEditorBase TopicEditorBase
LtsUtilsGuiDds LtsUtilsGuiDds
@@ -77,4 +86,5 @@ NGL_TARGET_LINK_LIBRARIES(BdvViewerGuiPlugin
ngltools ngltools
ExportBdvTopicSetting ExportBdvTopicSetting
) )
endif()
NGL_INSTALL_TARGET(BdvViewerGuiPlugin) NGL_INSTALL_TARGET(BdvViewerGuiPlugin)
@@ -4,6 +4,14 @@
# $Author$ # $Author$
# Created by hjl, SLSE, 2017-04-05 # 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 SET(bld_info_gui_SRCS
info_dialog_base.cpp info_dialog_base.cpp
info_dialog_base.h info_dialog_base.h
@@ -46,6 +54,7 @@ NGL_WRAP_UI(bld_info_gui_SRCS
) )
NGL_ADD_LIBRARY(WS BldInfoGuiPlugin MODULE ${bld_info_gui_SRCS}) NGL_ADD_LIBRARY(WS BldInfoGuiPlugin MODULE ${bld_info_gui_SRCS})
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(BldInfoGuiPlugin NGL_TARGET_LINK_LIBRARIES(BldInfoGuiPlugin
Qt6::Core Qt6::Core
BldInfoGuiPluginInterface BldInfoGuiPluginInterface
@@ -56,7 +65,7 @@ NGL_TARGET_LINK_LIBRARIES(BldInfoGuiPlugin
svcBldClient svcBldClient
svcAsmClient svcAsmClient
svcBldCommon svcBldCommon
Qt6::Widgets ${Qt6_Widgets}
Qt6::Network Qt6::Network
LtsWidgets LtsWidgets
LtsSession LtsSession
@@ -73,5 +82,6 @@ NGL_TARGET_LINK_LIBRARIES(BldInfoGuiPlugin
GuiPluginInterface GuiPluginInterface
) )
endif()
NGL_INSTALL_TARGET(BldInfoGuiPlugin) NGL_INSTALL_TARGET(BldInfoGuiPlugin)
@@ -5,6 +5,14 @@
# Created by Hannes Baeuerle, SLSE, 2017-02-24 # 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 SET(ces_participant_move_gui_SRCS
logger.cpp logger.cpp
logger.h logger.h
@@ -24,6 +32,7 @@ NGL_WRAP_UI (ces_participant_move_gui_SRCS
) )
NGL_ADD_LIBRARY(WS CesParticipantMoveGuiPlugin MODULE ${ces_participant_move_gui_SRCS}) NGL_ADD_LIBRARY(WS CesParticipantMoveGuiPlugin MODULE ${ces_participant_move_gui_SRCS})
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(CesParticipantMoveGuiPlugin NGL_TARGET_LINK_LIBRARIES(CesParticipantMoveGuiPlugin
AsbDataPluginInterface AsbDataPluginInterface
LtsCoordTrans LtsCoordTrans
@@ -34,7 +43,7 @@ NGL_TARGET_LINK_LIBRARIES(CesParticipantMoveGuiPlugin
GuiPluginInterface GuiPluginInterface
AsmGuiPluginInterface AsmGuiPluginInterface
ExmDataPluginInterface ExmDataPluginInterface
Qt6::Widgets ${Qt6_Widgets}
PpmCommon PpmCommon
FlmDataPluginInterface FlmDataPluginInterface
LtsUtilsGuiDds LtsUtilsGuiDds
@@ -47,5 +56,6 @@ NGL_TARGET_LINK_LIBRARIES(CesParticipantMoveGuiPlugin
ltsCoordWidget ltsCoordWidget
LtsUtilsSettings LtsUtilsSettings
) )
endif()
NGL_INSTALL_TARGET(CesParticipantMoveGuiPlugin) NGL_INSTALL_TARGET(CesParticipantMoveGuiPlugin)
@@ -5,6 +5,14 @@
# Created by Hannes Baeuerle, SLSE, 2017-02-24 # 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 SET(ces_participant_uas_gui_SRCS
logger.cpp logger.cpp
logger.h logger.h
@@ -37,6 +45,7 @@ target_sources(CesParticipantUASGuiPlugin
) )
endif() endif()
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(CesParticipantUASGuiPlugin NGL_TARGET_LINK_LIBRARIES(CesParticipantUASGuiPlugin
AsbDataPluginInterface AsbDataPluginInterface
LtsCoordTrans LtsCoordTrans
@@ -47,7 +56,7 @@ NGL_TARGET_LINK_LIBRARIES(CesParticipantUASGuiPlugin
GuiPluginInterface GuiPluginInterface
AsmGuiPluginInterface AsmGuiPluginInterface
ExmDataPluginInterface ExmDataPluginInterface
Qt6::Widgets ${Qt6_Widgets}
PpmCommon PpmCommon
FlmDataPluginInterface FlmDataPluginInterface
LtsUtilsGuiDds LtsUtilsGuiDds
@@ -60,5 +69,6 @@ NGL_TARGET_LINK_LIBRARIES(CesParticipantUASGuiPlugin
ltsCoordWidget ltsCoordWidget
LtsUtilsSettings LtsUtilsSettings
) )
endif()
NGL_INSTALL_TARGET(CesParticipantUASGuiPlugin) NGL_INSTALL_TARGET(CesParticipantUASGuiPlugin)
@@ -5,6 +5,14 @@
# Created by hjl, SLSE, 2016-12-01 # 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) FIND_PACKAGE(KDReports REQUIRED)
SET(cod_codification_data_gui_SRCS SET(cod_codification_data_gui_SRCS
@@ -45,6 +53,7 @@ NGL_WRAP_UI(cod_codification_data_gui_SRCS
) )
NGL_ADD_LIBRARY(WS CodCodificationDataGuiPlugin MODULE ${cod_codification_data_gui_SRCS}) NGL_ADD_LIBRARY(WS CodCodificationDataGuiPlugin MODULE ${cod_codification_data_gui_SRCS})
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(CodCodificationDataGuiPlugin NGL_TARGET_LINK_LIBRARIES(CodCodificationDataGuiPlugin
LtsPrinting LtsPrinting
NGLLogger NGLLogger
@@ -54,7 +63,7 @@ NGL_TARGET_LINK_LIBRARIES(CodCodificationDataGuiPlugin
CodGuiPluginInterface CodGuiPluginInterface
CodDataPluginInterface CodDataPluginInterface
PpmDataPluginInterface PpmDataPluginInterface
Qt6::Widgets ${Qt6_Widgets}
KDReports::KDReports KDReports::KDReports
LtsWidgets LtsWidgets
LtsDataView LtsDataView
@@ -63,5 +72,6 @@ NGL_TARGET_LINK_LIBRARIES(CodCodificationDataGuiPlugin
ngltools ngltools
LtsUtilsSettings LtsUtilsSettings
) )
endif()
NGL_INSTALL_TARGET(CodCodificationDataGuiPlugin) NGL_INSTALL_TARGET(CodCodificationDataGuiPlugin)
@@ -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 SET(lt_SRCS
main.cpp main.cpp
maindialog.h maindialog.h
@@ -15,12 +23,14 @@ NGL_WRAP_UI(lt_SRCS ui/maindialog.ui)
NGL_ADD_EXECUTABLE(WS CODTest ${lt_SRCS}) NGL_ADD_EXECUTABLE(WS CODTest ${lt_SRCS})
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(CODTest NGL_TARGET_LINK_LIBRARIES(CODTest
Qt6::Widgets ${Qt6_Widgets}
Qt6::Core Qt6::Core
nglapplication nglapplication
NGLLogger NGLLogger
) )
endif()
NGL_INSTALL_TARGET_DEVEL(CODTest) NGL_INSTALL_TARGET_DEVEL(CODTest)
NGL_INSTALL(WS FILES log4cxx_cod_test.props DESTINATION bin COMPONENT Devel) NGL_INSTALL(WS FILES log4cxx_cod_test.props DESTINATION bin COMPONENT Devel)
@@ -5,10 +5,18 @@
# Created by Hannes Fritsche, ESZS, 2024-08-05 # 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() RETURN()
ENDIF() ENDIF()
@@ -37,6 +45,7 @@ NGL_WRAP_UI(cds_gui_SRCS
) )
NGL_ADD_LIBRARY(WS CdsSimulationGuiPlugin MODULE ${cds_gui_SRCS}) NGL_ADD_LIBRARY(WS CdsSimulationGuiPlugin MODULE ${cds_gui_SRCS})
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(CdsSimulationGuiPlugin NGL_TARGET_LINK_LIBRARIES(CdsSimulationGuiPlugin
CdsGuiPluginInterface CdsGuiPluginInterface
IsmDataPluginInterface IsmDataPluginInterface
@@ -51,11 +60,12 @@ NGL_TARGET_LINK_LIBRARIES(CdsSimulationGuiPlugin
ngltools ngltools
PdmDataPluginInterface PdmDataPluginInterface
PpmDataPluginInterface PpmDataPluginInterface
Qt6::Widgets ${Qt6_Widgets}
situationMap situationMap
situationMapGeometryModel situationMapGeometryModel
SituationMapGuiPluginInterface SituationMapGuiPluginInterface
svcAesCommon svcAesCommon
) )
endif()
NGL_INSTALL_TARGET(CdsSimulationGuiPlugin) NGL_INSTALL_TARGET(CdsSimulationGuiPlugin)
@@ -6,6 +6,14 @@
# Created by Mike Wille, SLSE, 2017-11-15 # 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 SET(dev_gui_SRCS
dev_gui_plugin.cpp dev_gui_plugin.cpp
dev_gui_plugin.h 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_ADD_LIBRARY2(WS NO_TRANSLATION DevGuiPlugin SHARED ${dev_gui_SRCS})
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(DevGuiPlugin NGL_TARGET_LINK_LIBRARIES(DevGuiPlugin
Qt6::Widgets ${Qt6_Widgets}
Qt6::Network Qt6::Network
ngltranslator ngltranslator
LtsWidgets LtsWidgets
@@ -53,6 +62,7 @@ NGL_TARGET_LINK_LIBRARIES(DevGuiPlugin
#ExmDataPluginInterface #ExmDataPluginInterface
svcExmClient svcExmClient
) )
endif()
NGL_INSTALL_TARGET(DevGuiPlugin) NGL_INSTALL_TARGET(DevGuiPlugin)
@@ -5,6 +5,14 @@
# Created by Filip Biedziak, NLE, 2020-08-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 SET(efm_sound_area_gui_SRCS
efm_sound_area_gui_plugin.cpp efm_sound_area_gui_plugin.cpp
efm_sound_area_gui_plugin.h efm_sound_area_gui_plugin.h
@@ -43,6 +51,7 @@ NGL_WRAP_UI(efm_sound_area_gui_SRCS
) )
NGL_ADD_LIBRARY(WS EfmSoundAreaGuiPlugin MODULE ${efm_sound_area_gui_SRCS}) NGL_ADD_LIBRARY(WS EfmSoundAreaGuiPlugin MODULE ${efm_sound_area_gui_SRCS})
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(EfmSoundAreaGuiPlugin NGL_TARGET_LINK_LIBRARIES(EfmSoundAreaGuiPlugin
ngltools ngltools
LtsSession LtsSession
@@ -50,7 +59,8 @@ NGL_TARGET_LINK_LIBRARIES(EfmSoundAreaGuiPlugin
IsmDataPluginInterface IsmDataPluginInterface
EfmDataPluginInterface EfmDataPluginInterface
EfmGuiPluginInterface EfmGuiPluginInterface
Qt6::Widgets ${Qt6_Widgets}
LtsUtilsGuiDds LtsUtilsGuiDds
) )
endif()
NGL_INSTALL_TARGET(EfmSoundAreaGuiPlugin) NGL_INSTALL_TARGET(EfmSoundAreaGuiPlugin)
@@ -5,6 +5,14 @@
# Created by Patric Karwat, SLSE, 2016-10-05 # 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 SET(esc_effect_show_gui_SRCS
esc_effect_show_gui_plugin.cpp esc_effect_show_gui_plugin.cpp
esc_effect_show_gui_plugin.h esc_effect_show_gui_plugin.h
@@ -37,6 +45,7 @@ NGL_WRAP_UI(esc_effect_show_gui_SRCS
) )
NGL_ADD_LIBRARY(WS EscEffectShowGuiPlugin MODULE ${esc_effect_show_gui_SRCS}) NGL_ADD_LIBRARY(WS EscEffectShowGuiPlugin MODULE ${esc_effect_show_gui_SRCS})
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(EscEffectShowGuiPlugin NGL_TARGET_LINK_LIBRARIES(EscEffectShowGuiPlugin
NGLLogger NGLLogger
ngltools ngltools
@@ -46,7 +55,7 @@ NGL_TARGET_LINK_LIBRARIES(EscEffectShowGuiPlugin
EscDataPluginInterface EscDataPluginInterface
SituationMapGuiPluginInterface SituationMapGuiPluginInterface
TabocDataPluginInterface TabocDataPluginInterface
Qt6::Widgets ${Qt6_Widgets}
LtsWidgets LtsWidgets
LtsDataView LtsDataView
LtsNotification LtsNotification
@@ -54,5 +63,6 @@ NGL_TARGET_LINK_LIBRARIES(EscEffectShowGuiPlugin
LtsCoordTrans LtsCoordTrans
ltsCoordWidget ltsCoordWidget
) )
endif()
NGL_INSTALL_TARGET(EscEffectShowGuiPlugin) NGL_INSTALL_TARGET(EscEffectShowGuiPlugin)
@@ -5,6 +5,14 @@
# Created by Patric Karwat, SLSE, 2016-10-05 # 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 SET(esm_effect_show_gui_SRCS
esm_effect_show_gui_plugin.cpp esm_effect_show_gui_plugin.cpp
esm_effect_show_gui_plugin.h esm_effect_show_gui_plugin.h
@@ -36,6 +44,7 @@ NGL_WRAP_UI(esm_effect_show_gui_SRCS
) )
NGL_ADD_LIBRARY(WS EsmEffectShowGuiPlugin MODULE ${esm_effect_show_gui_SRCS}) NGL_ADD_LIBRARY(WS EsmEffectShowGuiPlugin MODULE ${esm_effect_show_gui_SRCS})
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(EsmEffectShowGuiPlugin NGL_TARGET_LINK_LIBRARIES(EsmEffectShowGuiPlugin
NGLLogger NGLLogger
ngltools ngltools
@@ -43,7 +52,7 @@ NGL_TARGET_LINK_LIBRARIES(EsmEffectShowGuiPlugin
LtsSession LtsSession
EsmGuiPluginInterface EsmGuiPluginInterface
EsmDataPluginInterface EsmDataPluginInterface
Qt6::Widgets ${Qt6_Widgets}
LtsWidgets LtsWidgets
LtsDataView LtsDataView
LtsUtilsGuiDds LtsUtilsGuiDds
@@ -56,6 +65,7 @@ NGL_TARGET_LINK_LIBRARIES(EsmEffectShowGuiPlugin
PpmCommon PpmCommon
LtsUtilsSettings LtsUtilsSettings
) )
endif()
NGL_INSTALL_TARGET(EsmEffectShowGuiPlugin) NGL_INSTALL_TARGET(EsmEffectShowGuiPlugin)
@@ -5,6 +5,14 @@
# #
# Created by Mike Wille, SLSE, 2017-03-15 # 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) ADD_SUBDIRECTORY(SanNineLinerEdit)
SET(evl_edit_gui_SRCS SET(evl_edit_gui_SRCS
@@ -62,6 +70,7 @@ NGL_WRAP_UI(evl_edit_gui_SRCS
NGL_ADD_LIBRARY(WS EvlEditGuiPlugin MODULE ${evl_edit_gui_SRCS}) NGL_ADD_LIBRARY(WS EvlEditGuiPlugin MODULE ${evl_edit_gui_SRCS})
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(EvlEditGuiPlugin NGL_TARGET_LINK_LIBRARIES(EvlEditGuiPlugin
LtsPrinting LtsPrinting
NGLLogger NGLLogger
@@ -75,7 +84,7 @@ NGL_TARGET_LINK_LIBRARIES(EvlEditGuiPlugin
OscDataPluginInterface OscDataPluginInterface
svcEvlCommon svcEvlCommon
Qt6::Widgets ${Qt6_Widgets}
LtsWidgets LtsWidgets
LtsDataView LtsDataView
LtsUtilsGuiDds LtsUtilsGuiDds
@@ -91,5 +100,6 @@ NGL_TARGET_LINK_LIBRARIES(EvlEditGuiPlugin
LtsScriptTimeline # TopicEditor LtsScriptTimeline # TopicEditor
LtsUtilsSettings LtsUtilsSettings
) )
endif()
NGL_INSTALL_TARGET(EvlEditGuiPlugin) NGL_INSTALL_TARGET(EvlEditGuiPlugin)
@@ -5,6 +5,14 @@
# Created by Christian Ehrlicher, SLSE, 2016-02-29 # 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 SET(san_edit_gui_SRCS
san_nine_liner_edit_gui_plugin.cpp san_nine_liner_edit_gui_plugin.cpp
san_nine_liner_edit_gui_plugin.h san_nine_liner_edit_gui_plugin.h
@@ -22,6 +30,7 @@ NGL_WRAP_UI(san_edit_gui_SRCS
) )
NGL_ADD_LIBRARY(WS EvlSanNineLinerEditGuiPlugin MODULE ${san_edit_gui_SRCS}) NGL_ADD_LIBRARY(WS EvlSanNineLinerEditGuiPlugin MODULE ${san_edit_gui_SRCS})
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(EvlSanNineLinerEditGuiPlugin NGL_TARGET_LINK_LIBRARIES(EvlSanNineLinerEditGuiPlugin
ngltools # dtg ngltools # dtg
ngltranslator ngltranslator
@@ -31,7 +40,7 @@ NGL_TARGET_LINK_LIBRARIES(EvlSanNineLinerEditGuiPlugin
EvlGuiPluginInterface EvlGuiPluginInterface
svcEvlCommon svcEvlCommon
Qt6::Widgets ${Qt6_Widgets}
LtsCoordTrans LtsCoordTrans
ltsCoordWidget ltsCoordWidget
LtsWidgets LtsWidgets
@@ -42,6 +51,7 @@ NGL_TARGET_LINK_LIBRARIES(EvlSanNineLinerEditGuiPlugin
ProjectConfig ProjectConfig
LtsUtilsGuiConnectDialog LtsUtilsGuiConnectDialog
) )
endif()
NGL_INSTALL_TARGET(EvlSanNineLinerEditGuiPlugin) NGL_INSTALL_TARGET(EvlSanNineLinerEditGuiPlugin)
@@ -5,6 +5,14 @@
# Created by Christian Ehrlicher, SLSE, 2016-02-29 # 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 SET(exm_edit_gui_SRCS
exm_edit_gui_plugin.cpp exm_edit_gui_plugin.cpp
exm_edit_gui_plugin.h exm_edit_gui_plugin.h
@@ -54,6 +62,7 @@ NGL_WRAP_UI(exm_edit_gui_SRCS
) )
NGL_ADD_LIBRARY(WS ExmEditGuiPlugin MODULE ${exm_edit_gui_SRCS}) NGL_ADD_LIBRARY(WS ExmEditGuiPlugin MODULE ${exm_edit_gui_SRCS})
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(ExmEditGuiPlugin NGL_TARGET_LINK_LIBRARIES(ExmEditGuiPlugin
ngltools # dtg ngltools # dtg
NGLLogger NGLLogger
@@ -66,7 +75,7 @@ NGL_TARGET_LINK_LIBRARIES(ExmEditGuiPlugin
OpmDataPluginInterface OpmDataPluginInterface
ExmGuiPluginInterface ExmGuiPluginInterface
FlmDataPluginInterface FlmDataPluginInterface
Qt6::Widgets ${Qt6_Widgets}
LtsCoordTrans LtsCoordTrans
LtsWidgets LtsWidgets
LtsDataView LtsDataView
@@ -76,6 +85,7 @@ NGL_TARGET_LINK_LIBRARIES(ExmEditGuiPlugin
ProjectConfig ProjectConfig
LtsUtilsGuiConnectDialog LtsUtilsGuiConnectDialog
) )
endif()
NGL_INSTALL_TARGET(ExmEditGuiPlugin) NGL_INSTALL_TARGET(ExmEditGuiPlugin)
@@ -6,6 +6,14 @@
# Created by Mike Wille, SLSE, 2017-03-31 # 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) INCLUDE(MacroCodeGenIdl)
SET(flm_explorer_gui_SRCS SET(flm_explorer_gui_SRCS
@@ -52,6 +60,7 @@ INSTALL_SHARED_FILES(flm_explorer_gui_SRCS
NGL_ADD_LIBRARY(WS FlmExplorerGuiPlugin MODULE ${flm_explorer_gui_SRCS}) NGL_ADD_LIBRARY(WS FlmExplorerGuiPlugin MODULE ${flm_explorer_gui_SRCS})
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(FlmExplorerGuiPlugin NGL_TARGET_LINK_LIBRARIES(FlmExplorerGuiPlugin
NGLLogger NGLLogger
FlmExplorerGuiPluginInterface FlmExplorerGuiPluginInterface
@@ -59,7 +68,7 @@ NGL_TARGET_LINK_LIBRARIES(FlmExplorerGuiPlugin
OpmDataPluginInterface OpmDataPluginInterface
ExmDataPluginInterface ExmDataPluginInterface
PpmDataPluginInterface PpmDataPluginInterface
Qt6::Widgets ${Qt6_Widgets}
LtsDataView LtsDataView
LtsUtilsGuiDds LtsUtilsGuiDds
LtsUtilsGuiConnectDialog LtsUtilsGuiConnectDialog
@@ -80,5 +89,6 @@ NGL_TARGET_LINK_LIBRARIES(FlmExplorerGuiPlugin
advancedSymbology advancedSymbology
svcAesCommon svcAesCommon
) )
endif()
NGL_INSTALL_TARGET(FlmExplorerGuiPlugin) NGL_INSTALL_TARGET(FlmExplorerGuiPlugin)
@@ -5,6 +5,14 @@
# Created by Mike Wille, SLSE, 2016-05-05 # 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 SET(flm_combobox_gui_SRCS
flm_combobox_gui_plugin.cpp flm_combobox_gui_plugin.cpp
flm_combobox_gui_plugin.h 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_ADD_LIBRARY(WS FlmComboBoxGuiPlugin MODULE ${flm_combobox_gui_SRCS})
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(FlmComboBoxGuiPlugin NGL_TARGET_LINK_LIBRARIES(FlmComboBoxGuiPlugin
NGLLogger NGLLogger
FlmGuiComboboxPluginInterface FlmGuiComboboxPluginInterface
FlmDataPluginInterface FlmDataPluginInterface
Qt6::Widgets ${Qt6_Widgets}
LtsWidgets LtsWidgets
LtsSession LtsSession
) )
endif()
NGL_INSTALL_TARGET(FlmComboBoxGuiPlugin) NGL_INSTALL_TARGET(FlmComboBoxGuiPlugin)
@@ -5,6 +5,14 @@
# Created by Christian Ehrlicher, SLSE, 2017-06-16 # 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) ADD_SUBDIRECTORY(Common)
SET(flt_aes_widget_SRCS SET(flt_aes_widget_SRCS
@@ -17,6 +25,7 @@ NGL_WRAP_UI(flt_aes_widget_SRCS
) )
NGL_ADD_LIBRARY(WS FltAesWidget STATIC ${flt_aes_widget_SRCS}) NGL_ADD_LIBRARY(WS FltAesWidget STATIC ${flt_aes_widget_SRCS})
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(FltAesWidget NGL_TARGET_LINK_LIBRARIES(FltAesWidget
PRIVATE PRIVATE
svcFltCommon svcFltCommon
@@ -26,8 +35,9 @@ NGL_TARGET_LINK_LIBRARIES(FltAesWidget
LtsSessionData LtsSessionData
PdmGuiPluginInterface PdmGuiPluginInterface
PpmGuiComboboxPluginInterface PpmGuiComboboxPluginInterface
Qt6::Widgets ${Qt6_Widgets}
) )
endif()
NGL_TARGET_INCLUDE_DIRECTORIES(FltAesWidget NGL_TARGET_INCLUDE_DIRECTORIES(FltAesWidget
PUBLIC PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../../.. ${CMAKE_CURRENT_SOURCE_DIR}/../../..
@@ -41,6 +51,7 @@ SET(flt_aes_gui_SRCS
) )
NGL_ADD_LIBRARY(WS FltAesGuiPlugin MODULE ${flt_aes_gui_SRCS}) NGL_ADD_LIBRARY(WS FltAesGuiPlugin MODULE ${flt_aes_gui_SRCS})
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(FltAesGuiPlugin NGL_TARGET_LINK_LIBRARIES(FltAesGuiPlugin
FltAesGuiCommon FltAesGuiCommon
FltAesGuiPluginInterface FltAesGuiPluginInterface
@@ -52,7 +63,8 @@ NGL_TARGET_LINK_LIBRARIES(FltAesGuiPlugin
LtsUtilsGuiDds LtsUtilsGuiDds
LtsUtilsSettings LtsUtilsSettings
LtsWidgets LtsWidgets
Qt6::Widgets ${Qt6_Widgets}
) )
endif()
NGL_INSTALL_TARGET(FltAesGuiPlugin) NGL_INSTALL_TARGET(FltAesGuiPlugin)
@@ -6,6 +6,14 @@
# Created by Mike Wille, SLSE, 2017-11-27 # 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 SET(flt_aes_gui_common_SRCS
common.h common.h
aes_display_filter_impl.h aes_display_filter_impl.h
@@ -21,15 +29,17 @@ NGL_TARGET_INCLUDE_DIRECTORIES(FltAesGuiCommon
PUBLIC PUBLIC
${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}
) )
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(FltAesGuiCommon NGL_TARGET_LINK_LIBRARIES(FltAesGuiCommon
PRIVATE PRIVATE
svcPpmCommon svcPpmCommon
PUBLIC PUBLIC
FltDataPluginInterface FltDataPluginInterface
Qt6::Core Qt6::Core
Qt6::Widgets # ifdef LTS_DEBUG QMessageBox ${Qt6_Widgets} # ifdef LTS_DEBUG QMessageBox
svcFltCommon svcFltCommon
svcAesCommon svcAesCommon
) )
endif()
NGL_INSTALL_TARGET(FltAesGuiCommon) NGL_INSTALL_TARGET(FltAesGuiCommon)
@@ -5,6 +5,14 @@
# Created by Christian Ehrlicher, SLSE, 2017-06-16 # 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 SET(flt_bldg_cmpnt_widget_SRCS
flt_building_component_settings_widget.cpp flt_building_component_settings_widget.cpp
flt_building_component_settings_widget.h flt_building_component_settings_widget.h
@@ -15,6 +23,7 @@ NGL_WRAP_UI(flt_bldg_cmpnt_widget_SRCS
) )
NGL_ADD_LIBRARY(WS FltBldgCmpntWidget STATIC ${flt_bldg_cmpnt_widget_SRCS}) NGL_ADD_LIBRARY(WS FltBldgCmpntWidget STATIC ${flt_bldg_cmpnt_widget_SRCS})
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(FltBldgCmpntWidget NGL_TARGET_LINK_LIBRARIES(FltBldgCmpntWidget
PRIVATE PRIVATE
svcFltCommon svcFltCommon
@@ -25,8 +34,9 @@ NGL_TARGET_LINK_LIBRARIES(FltBldgCmpntWidget
LtsSessionData LtsSessionData
PdmGuiPluginInterface PdmGuiPluginInterface
PpmGuiComboboxPluginInterface PpmGuiComboboxPluginInterface
Qt6::Widgets ${Qt6_Widgets}
) )
endif()
NGL_TARGET_INCLUDE_DIRECTORIES(FltBldgCmpntWidget NGL_TARGET_INCLUDE_DIRECTORIES(FltBldgCmpntWidget
PUBLIC PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../../.. ${CMAKE_CURRENT_SOURCE_DIR}/../../..
@@ -41,6 +51,7 @@ SET(flt_bldg_cmpnt_gui_SRCS
) )
NGL_ADD_LIBRARY(WS Fltbldg_cmpntGuiPlugin MODULE ${flt_bldg_cmpnt_gui_SRCS}) NGL_ADD_LIBRARY(WS Fltbldg_cmpntGuiPlugin MODULE ${flt_bldg_cmpnt_gui_SRCS})
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(Fltbldg_cmpntGuiPlugin NGL_TARGET_LINK_LIBRARIES(Fltbldg_cmpntGuiPlugin
FltAesGuiCommon FltAesGuiCommon
FltBldgCmpntGuiPluginInterface FltBldgCmpntGuiPluginInterface
@@ -52,7 +63,8 @@ NGL_TARGET_LINK_LIBRARIES(Fltbldg_cmpntGuiPlugin
LtsUtilsGuiDds LtsUtilsGuiDds
LtsUtilsSettings LtsUtilsSettings
LtsWidgets LtsWidgets
Qt6::Widgets ${Qt6_Widgets}
) )
endif()
NGL_INSTALL_TARGET(Fltbldg_cmpntGuiPlugin) NGL_INSTALL_TARGET(Fltbldg_cmpntGuiPlugin)
@@ -6,6 +6,14 @@
# Created by Norbert Thoden, NLE, 2019-02-25 # 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 SET(flt_filter_change_SRCS
flt_filter_change.cpp flt_filter_change.cpp
flt_filter_change.h flt_filter_change.h
@@ -21,6 +29,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(FltFilterChange
${CMAKE_CURRENT_SOURCE_DIR}/../ ${CMAKE_CURRENT_SOURCE_DIR}/../
${CMAKE_CURRENT_BINARY_DIR}/../ ${CMAKE_CURRENT_BINARY_DIR}/../
) )
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(FltFilterChange NGL_TARGET_LINK_LIBRARIES(FltFilterChange
PRIVATE PRIVATE
LtsSession LtsSession
@@ -36,7 +45,8 @@ NGL_TARGET_LINK_LIBRARIES(FltFilterChange
FltBldgCmpntGuiPluginInterface FltBldgCmpntGuiPluginInterface
OpmGuiPluginInterface OpmGuiPluginInterface
Qt6::Core Qt6::Core
Qt6::Widgets ${Qt6_Widgets}
) )
endif()
NGL_INSTALL_TARGET(FltFilterChange) NGL_INSTALL_TARGET(FltFilterChange)
@@ -4,6 +4,14 @@
# Created by Christian Ehrlicher, SLSE, 2017-06-16 # 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 SET(flt_part_widget_SRCS
flt_collapse_expand_participants_widget.cpp flt_collapse_expand_participants_widget.cpp
flt_collapse_expand_participants_widget.h flt_collapse_expand_participants_widget.h
@@ -19,6 +27,7 @@ NGL_WRAP_UI(flt_part_widget_SRCS
flt_type_filter_widget.ui flt_type_filter_widget.ui
) )
NGL_ADD_LIBRARY(WS FltParticipantWidget STATIC ${flt_part_widget_SRCS}) NGL_ADD_LIBRARY(WS FltParticipantWidget STATIC ${flt_part_widget_SRCS})
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(FltParticipantWidget NGL_TARGET_LINK_LIBRARIES(FltParticipantWidget
PRIVATE PRIVATE
svcFltCommon svcFltCommon
@@ -29,8 +38,9 @@ NGL_TARGET_LINK_LIBRARIES(FltParticipantWidget
FltDataPluginInterface FltDataPluginInterface
PdmGuiPluginInterface PdmGuiPluginInterface
PpmGuiComboboxPluginInterface PpmGuiComboboxPluginInterface
Qt6::Widgets ${Qt6_Widgets}
) )
endif()
NGL_TARGET_INCLUDE_DIRECTORIES(FltParticipantWidget NGL_TARGET_INCLUDE_DIRECTORIES(FltParticipantWidget
PUBLIC PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../../.. ${CMAKE_CURRENT_SOURCE_DIR}/../../..
@@ -50,6 +60,7 @@ SET(flt_part_gui_SRCS
NGL_ADD_LIBRARY(WS FltParticipantGuiPlugin MODULE ${flt_part_gui_SRCS}) NGL_ADD_LIBRARY(WS FltParticipantGuiPlugin MODULE ${flt_part_gui_SRCS})
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(FltParticipantGuiPlugin NGL_TARGET_LINK_LIBRARIES(FltParticipantGuiPlugin
AsbDataPluginInterface AsbDataPluginInterface
LtsPrinting LtsPrinting
@@ -69,7 +80,8 @@ NGL_TARGET_LINK_LIBRARIES(FltParticipantGuiPlugin
LtsUtilsGuiDds LtsUtilsGuiDds
LtsUtilsSettings LtsUtilsSettings
LtsWidgets LtsWidgets
Qt6::Widgets ${Qt6_Widgets}
) )
endif()
NGL_INSTALL_TARGET(FltParticipantGuiPlugin) NGL_INSTALL_TARGET(FltParticipantGuiPlugin)
@@ -5,20 +5,30 @@
# Created by Mike Wille, SLTE, 2020-11-22 # 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 SET(fsp_gui_SRCS
fsp_gui_plugin.cpp fsp_gui_plugin.cpp
fsp_gui_plugin.h fsp_gui_plugin.h
) )
NGL_ADD_LIBRARY(WS FspGuiPlugin MODULE ${fsp_gui_SRCS}) NGL_ADD_LIBRARY(WS FspGuiPlugin MODULE ${fsp_gui_SRCS})
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(FspGuiPlugin NGL_TARGET_LINK_LIBRARIES(FspGuiPlugin
LtsSession LtsSession
LtsSessionData LtsSessionData
FspGuiPluginInterface FspGuiPluginInterface
Qt6::Widgets ${Qt6_Widgets}
LtsNotification LtsNotification
svcAsmCommon svcAsmCommon
) )
endif()
NGL_INSTALL_TARGET(FspGuiPlugin) NGL_INSTALL_TARGET(FspGuiPlugin)
@@ -6,6 +6,14 @@
# Created by Dassow Philipp, SLEA, 2017-08-22 # 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 SET (gim_info_gui_SRCS
gim_info_gui_plugin.h gim_info_gui_plugin.h
gim_info_gui_plugin.cpp gim_info_gui_plugin.cpp
@@ -18,6 +26,7 @@ QT5_WRAP_UI(gim_info_gui_SRCS
) )
NGL_ADD_LIBRARY(WS GimInfoGuiPlugin MODULE ${gim_info_gui_SRCS}) NGL_ADD_LIBRARY(WS GimInfoGuiPlugin MODULE ${gim_info_gui_SRCS})
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(GimInfoGuiPlugin NGL_TARGET_LINK_LIBRARIES(GimInfoGuiPlugin
PRIVATE PRIVATE
svcGimCommon svcGimCommon
@@ -30,7 +39,8 @@ NGL_TARGET_LINK_LIBRARIES(GimInfoGuiPlugin
AsbDataPluginInterface AsbDataPluginInterface
PpmDataPluginInterface PpmDataPluginInterface
SituationMapGuiPluginInterface SituationMapGuiPluginInterface
Qt6::Widgets ${Qt6_Widgets}
) )
endif()
NGL_INSTALL_TARGET(GimInfoGuiPlugin) NGL_INSTALL_TARGET(GimInfoGuiPlugin)
@@ -6,6 +6,14 @@
# Created by Dassow Philipp, SLEA, 2017-07-28 # 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 SET (gim_pairing_gui_SRCS
gim_pairing_gui_plugin.h gim_pairing_gui_plugin.h
gim_pairing_gui_plugin.cpp gim_pairing_gui_plugin.cpp
@@ -18,6 +26,7 @@ QT5_WRAP_UI(gim_pairing_gui_SRCS
) )
NGL_ADD_LIBRARY(WS GimPairingGuiPlugin MODULE ${gim_pairing_gui_SRCS}) NGL_ADD_LIBRARY(WS GimPairingGuiPlugin MODULE ${gim_pairing_gui_SRCS})
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(GimPairingGuiPlugin NGL_TARGET_LINK_LIBRARIES(GimPairingGuiPlugin
PRIVATE PRIVATE
LtsPrinting LtsPrinting
@@ -32,7 +41,8 @@ NGL_TARGET_LINK_LIBRARIES(GimPairingGuiPlugin
PpmDataPluginInterface PpmDataPluginInterface
PpmGuiComboboxPluginInterface PpmGuiComboboxPluginInterface
PpmCommon PpmCommon
Qt6::Widgets ${Qt6_Widgets}
) )
endif()
NGL_INSTALL_TARGET(GimPairingGuiPlugin) NGL_INSTALL_TARGET(GimPairingGuiPlugin)
@@ -5,6 +5,14 @@
# Created by Patric Karwat, SLSE, 2016-10-05 # 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 SET(gna_nasat_part_gui_SRCS
gna_nasat_part_gui_plugin.cpp gna_nasat_part_gui_plugin.cpp
gna_nasat_part_gui_plugin.h gna_nasat_part_gui_plugin.h
@@ -20,6 +28,7 @@ NGL_WRAP_UI(gna_nasat_part_gui_SRCS
) )
NGL_ADD_LIBRARY(WS GnaNasatPartGuiPlugin MODULE ${gna_nasat_part_gui_SRCS}) NGL_ADD_LIBRARY(WS GnaNasatPartGuiPlugin MODULE ${gna_nasat_part_gui_SRCS})
if(QT6_GUI_AVAILABLE)
NGL_TARGET_LINK_LIBRARIES(GnaNasatPartGuiPlugin NGL_TARGET_LINK_LIBRARIES(GnaNasatPartGuiPlugin
LtsPrinting LtsPrinting
GnaCommon GnaCommon
@@ -30,7 +39,7 @@ NGL_TARGET_LINK_LIBRARIES(GnaNasatPartGuiPlugin
svcGnaCommon svcGnaCommon
svcPpmCommon svcPpmCommon
GuiPluginInterface GuiPluginInterface
Qt6::Widgets ${Qt6_Widgets}
LtsCoordTrans LtsCoordTrans
LtsWidgets LtsWidgets
LtsDataView LtsDataView
@@ -38,5 +47,6 @@ NGL_TARGET_LINK_LIBRARIES(GnaNasatPartGuiPlugin
LtsUtilsGuiDds LtsUtilsGuiDds
LtsUtilsSettings LtsUtilsSettings
) )
endif()
NGL_INSTALL_TARGET(GnaNasatPartGuiPlugin) 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