Adds latest migration results
This commit is contained in:
829 files changed
+35074
-70886
No files matched your search
@@ -8,14 +8,24 @@
|
||||
#
|
||||
# Data Plugin
|
||||
#
|
||||
# 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 MrkDataPlugin MODULE mrk_data_plugin.cpp mrk_data_plugin.h)
|
||||
set_target_properties(MrkDataPlugin PROPERTIES AUTOMOC ON)
|
||||
NGL_TARGET_LINK_LIBRARIES(MrkDataPlugin
|
||||
Qt6::Core
|
||||
Qt6::Widgets #QColor/QApplication for trackentry
|
||||
MrkDataPluginInterface
|
||||
svcMrkClient
|
||||
NGLLogger
|
||||
LtsSessionDataDds
|
||||
)
|
||||
if(QT6_GUI_AVAILABLE)
|
||||
NGL_TARGET_LINK_LIBRARIES(MrkDataPlugin
|
||||
Qt6::Core
|
||||
${Qt6_Widgets} #QColor/QApplication for trackentry
|
||||
MrkDataPluginInterface
|
||||
svcMrkClient
|
||||
NGLLogger
|
||||
LtsSessionDataDds
|
||||
)
|
||||
endif()
|
||||
NGL_INSTALL_TARGET(MrkDataPlugin)
|
||||
+25
-15
@@ -6,6 +6,14 @@
|
||||
#
|
||||
|
||||
# MrkCommon benötigt LtsDataView, welches nur mit BUILD_RTI verfügbar ist
|
||||
# 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)
|
||||
|
||||
#
|
||||
@@ -35,21 +43,23 @@ NGL_TARGET_INCLUDE_DIRECTORIES(MrkCommon
|
||||
PUBLIC
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../../Viewer/LtsDataView/
|
||||
)
|
||||
NGL_TARGET_LINK_LIBRARIES(MrkCommon
|
||||
PRIVATE
|
||||
NGLLogger
|
||||
LtsSession
|
||||
LtsSessionData
|
||||
LtsUtilsGuiDds
|
||||
# OpmDataPluginInterface # External dependency
|
||||
ngltools
|
||||
# svcMrkCommon # External dependency
|
||||
PUBLIC
|
||||
# MrkDataPluginInterface # External dependency - check if available
|
||||
Qt6::Widgets
|
||||
LtsWidgets
|
||||
LtsDataView
|
||||
)
|
||||
if(QT6_GUI_AVAILABLE)
|
||||
NGL_TARGET_LINK_LIBRARIES(MrkCommon
|
||||
PRIVATE
|
||||
NGLLogger
|
||||
LtsSession
|
||||
LtsSessionData
|
||||
LtsUtilsGuiDds
|
||||
# OpmDataPluginInterface # External dependency
|
||||
ngltools
|
||||
# svcMrkCommon # External dependency
|
||||
PUBLIC
|
||||
# MrkDataPluginInterface # External dependency - check if available
|
||||
${Qt6_Widgets}
|
||||
LtsWidgets
|
||||
LtsDataView
|
||||
)
|
||||
endif()
|
||||
|
||||
# FilterManagement nur bei BUILD_RTI
|
||||
if(BUILD_RTI)
|
||||
|
||||
+39
-29
@@ -5,6 +5,14 @@
|
||||
# Created by Christian Ehrlicher, SLSE, 2016-02-29
|
||||
#
|
||||
|
||||
# Make ${Qt6_Widgets} optional
|
||||
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
|
||||
set(Qt6_Widgets ${Qt6_Widgets})
|
||||
else()
|
||||
set(Qt6_Widgets "")
|
||||
endif()
|
||||
|
||||
|
||||
SET(mrk_edit_gui_SRCS
|
||||
mrk_edit_gui_plugin.cpp
|
||||
mrk_edit_gui_plugin.h
|
||||
@@ -34,35 +42,37 @@ NGL_WRAP_UI(mrk_edit_gui_SRCS
|
||||
)
|
||||
|
||||
NGL_ADD_LIBRARY(WS MrkEditGuiPlugin MODULE ${mrk_edit_gui_SRCS})
|
||||
NGL_TARGET_LINK_LIBRARIES(MrkEditGuiPlugin
|
||||
LtsPrinting
|
||||
NGLLogger
|
||||
LtsSession
|
||||
LtsSessionData
|
||||
LtsPluginManager
|
||||
MrkCommon
|
||||
MrkGuiPluginInterface
|
||||
MrkDataPluginInterface
|
||||
OpmDataPluginInterface
|
||||
FlmDataPluginInterface
|
||||
AvmDataPluginInterface
|
||||
SrmDataPluginInterface
|
||||
SrpDataPluginInterface
|
||||
FltDataPluginInterface
|
||||
Qt6::Widgets
|
||||
LtsWidgets
|
||||
ngltools
|
||||
nglsettings
|
||||
LtsDataView
|
||||
LtsUtilsGuiDds
|
||||
LtsAppManager
|
||||
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
|
||||
svcSrpClient
|
||||
svcAvmCommon
|
||||
TopicEditorBase
|
||||
LtsScriptTimeline # TopicEditor
|
||||
situationMap # SituationMap::OperatorMapSettings
|
||||
)
|
||||
if(QT6_GUI_AVAILABLE)
|
||||
NGL_TARGET_LINK_LIBRARIES(MrkEditGuiPlugin
|
||||
LtsPrinting
|
||||
NGLLogger
|
||||
LtsSession
|
||||
LtsSessionData
|
||||
LtsPluginManager
|
||||
MrkCommon
|
||||
MrkGuiPluginInterface
|
||||
MrkDataPluginInterface
|
||||
OpmDataPluginInterface
|
||||
FlmDataPluginInterface
|
||||
AvmDataPluginInterface
|
||||
SrmDataPluginInterface
|
||||
SrpDataPluginInterface
|
||||
FltDataPluginInterface
|
||||
${Qt6_Widgets}
|
||||
LtsWidgets
|
||||
ngltools
|
||||
nglsettings
|
||||
LtsDataView
|
||||
LtsUtilsGuiDds
|
||||
LtsAppManager
|
||||
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
|
||||
svcSrpClient
|
||||
svcAvmCommon
|
||||
TopicEditorBase
|
||||
LtsScriptTimeline # TopicEditor
|
||||
situationMap # SituationMap::OperatorMapSettings
|
||||
)
|
||||
endif()
|
||||
|
||||
NGL_INSTALL_TARGET(MrkEditGuiPlugin)
|
||||
|
||||
|
||||
Reference in new issue
Block a user