Adds latest migration results
This commit is contained in:
829 files changed
+35074
-70886
No files matched your search
@@ -5,6 +5,14 @@
|
||||
# Created by Christian Ehrlicher, SLSE, 2016-03-01
|
||||
#
|
||||
|
||||
# Make ${Qt6_Gui} optional
|
||||
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Gui)
|
||||
set(Qt6_Gui ${Qt6_Gui})
|
||||
else()
|
||||
set(Qt6_Gui "")
|
||||
endif()
|
||||
|
||||
|
||||
ADD_SUBDIRECTORY(Data)
|
||||
ADD_SUBDIRECTORY(Gui)
|
||||
ADD_SUBDIRECTORY(Helper)
|
||||
@@ -17,7 +25,7 @@ ADD_INTERFACE_LIBRARY(AsbDataPluginInterface
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/..
|
||||
DataPluginInterface
|
||||
advancedSymbology
|
||||
Qt6::Gui
|
||||
${Qt6_Gui}
|
||||
)
|
||||
|
||||
#
|
||||
@@ -37,5 +45,5 @@ ADD_INTERFACE_LIBRARY(AsbSymbolProxyGuiPluginInterface
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/asb_symbol_proxy_gui_plugin_interface.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/..
|
||||
GuiPluginInterface
|
||||
Qt6::Gui
|
||||
${Qt6_Gui}
|
||||
)
|
||||
@@ -5,6 +5,14 @@
|
||||
# Created by Mike Wille, SLSE, 2016-09-05
|
||||
#
|
||||
|
||||
# Make ${Qt6_Widgets} optional
|
||||
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
|
||||
set(Qt6_Widgets ${Qt6_Widgets})
|
||||
else()
|
||||
set(Qt6_Widgets "")
|
||||
endif()
|
||||
|
||||
|
||||
NGL_ADD_LIBRARY(WS AsbData STATIC
|
||||
asb_foreign_interface_impl.cpp
|
||||
asb_foreign_interface_impl.h
|
||||
@@ -17,14 +25,16 @@ TARGET_INCLUDE_DIRECTORIES(AsbData PRIVATE
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../../../Viewer/SituationMap/Symbology
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../../../../Z/src
|
||||
)
|
||||
NGL_TARGET_LINK_LIBRARIES(AsbData
|
||||
GimDataPluginInterface
|
||||
AsbDataPluginInterface
|
||||
AesDataPluginInterface
|
||||
PpmDataPluginInterface
|
||||
advancedSymbology
|
||||
Qt6::Widgets
|
||||
)
|
||||
if(QT6_GUI_AVAILABLE)
|
||||
NGL_TARGET_LINK_LIBRARIES(AsbData
|
||||
GimDataPluginInterface
|
||||
AsbDataPluginInterface
|
||||
AesDataPluginInterface
|
||||
PpmDataPluginInterface
|
||||
advancedSymbology
|
||||
${Qt6_Widgets}
|
||||
)
|
||||
endif()
|
||||
|
||||
#
|
||||
# Data Plugin
|
||||
|
||||
+31
-14
@@ -1,5 +1,20 @@
|
||||
# CMake script for SymbolEditor
|
||||
|
||||
# Make ${Qt6_Gui} optional
|
||||
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Gui)
|
||||
set(Qt6_Gui ${Qt6_Gui})
|
||||
else()
|
||||
set(Qt6_Gui "")
|
||||
endif()
|
||||
|
||||
# Make ${Qt6_Widgets} optional
|
||||
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
|
||||
set(Qt6_Widgets ${Qt6_Widgets})
|
||||
else()
|
||||
set(Qt6_Widgets "")
|
||||
endif()
|
||||
|
||||
|
||||
SET(symboleditor_SRCS
|
||||
asb_save_as_symbol.cpp
|
||||
asb_save_as_symbol.h
|
||||
@@ -43,18 +58,20 @@ TARGET_INCLUDE_DIRECTORIES(AsbSymEditGuiPlugin PRIVATE
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../../../../Viewer/SituationMap
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../../../../Viewer/SituationMap/Symbology
|
||||
)
|
||||
NGL_TARGET_LINK_LIBRARIES(AsbSymEditGuiPlugin
|
||||
NGLLogger
|
||||
LtsWidgets
|
||||
FlmDataPluginInterface
|
||||
PpmDataPluginInterface
|
||||
advancedSymbology
|
||||
advancedSymbologyXML
|
||||
LtsSession
|
||||
LtsSessionData
|
||||
LtsUtilsGuiDds
|
||||
Qt6::Core
|
||||
Qt6::Gui
|
||||
Qt6::Widgets
|
||||
)
|
||||
if(QT6_GUI_AVAILABLE)
|
||||
NGL_TARGET_LINK_LIBRARIES(AsbSymEditGuiPlugin
|
||||
NGLLogger
|
||||
LtsWidgets
|
||||
FlmDataPluginInterface
|
||||
PpmDataPluginInterface
|
||||
advancedSymbology
|
||||
advancedSymbologyXML
|
||||
LtsSession
|
||||
LtsSessionData
|
||||
LtsUtilsGuiDds
|
||||
Qt6::Core
|
||||
${Qt6_Gui}
|
||||
${Qt6_Widgets}
|
||||
)
|
||||
endif()
|
||||
NGL_INSTALL_TARGET(AsbSymEditGuiPlugin)
|
||||
+14
-12
@@ -23,18 +23,20 @@ TARGET_INCLUDE_DIRECTORIES(AsbSymbolProxyGuiPlugin PRIVATE
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../../../../Viewer/SituationMap
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../../../../Viewer/SituationMap/Symbology
|
||||
)
|
||||
NGL_TARGET_LINK_LIBRARIES(AsbSymbolProxyGuiPlugin
|
||||
AsbSymbolProxyGuiPluginInterface
|
||||
NGLLogger
|
||||
Qt6::Svg
|
||||
Qt6::Xml
|
||||
SituationMapGuiPluginInterface
|
||||
LtsSession
|
||||
LtsSessionData
|
||||
FlmDataPluginInterface
|
||||
OpmDataPluginInterface
|
||||
advancedSymbology
|
||||
)
|
||||
if(QT6_GUI_AVAILABLE)
|
||||
NGL_TARGET_LINK_LIBRARIES(AsbSymbolProxyGuiPlugin
|
||||
AsbSymbolProxyGuiPluginInterface
|
||||
NGLLogger
|
||||
Qt6::Svg
|
||||
Qt6::Xml
|
||||
SituationMapGuiPluginInterface
|
||||
LtsSession
|
||||
LtsSessionData
|
||||
FlmDataPluginInterface
|
||||
OpmDataPluginInterface
|
||||
advancedSymbology
|
||||
)
|
||||
endif()
|
||||
|
||||
NGL_INSTALL_TARGET(AsbSymbolProxyGuiPlugin)
|
||||
|
||||
|
||||
@@ -5,6 +5,14 @@
|
||||
# Created by Christian Ehrlicher, SLSE, 2017-11-01
|
||||
#
|
||||
|
||||
# Make ${Qt6_Gui} optional
|
||||
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Gui)
|
||||
set(Qt6_Gui ${Qt6_Gui})
|
||||
else()
|
||||
set(Qt6_Gui "")
|
||||
endif()
|
||||
|
||||
|
||||
SET(tmsr_SRCS
|
||||
table_model_symbol_renderer_base.cpp
|
||||
table_model_symbol_renderer_base.h
|
||||
@@ -16,11 +24,13 @@ NGL_TARGET_INCLUDE_DIRECTORIES(AsbHelper
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../
|
||||
${CMAKE_SOURCE_DIR}/Lts/Viewer/SituationMap/
|
||||
)
|
||||
NGL_TARGET_LINK_LIBRARIES(AsbHelper
|
||||
PUBLIC
|
||||
Qt6::Core
|
||||
PRIVATE
|
||||
Qt6::Gui
|
||||
AsbDataPluginInterface
|
||||
NGLLogger
|
||||
)
|
||||
if(QT6_GUI_AVAILABLE)
|
||||
NGL_TARGET_LINK_LIBRARIES(AsbHelper
|
||||
PUBLIC
|
||||
Qt6::Core
|
||||
PRIVATE
|
||||
${Qt6_Gui}
|
||||
AsbDataPluginInterface
|
||||
NGLLogger
|
||||
)
|
||||
endif()
|
||||
Reference in new issue
Block a user