Adds latest migration results
This commit is contained in:
829 files changed
+35074
-70886
No files matched your search
@@ -3,6 +3,14 @@
|
||||
# $HeadURL$
|
||||
# $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(ArcGIS REQUIRED)
|
||||
|
||||
# During development: (instead top CMakeLists.txt"
|
||||
@@ -54,28 +62,30 @@ SOURCE_GROUP(PlanEditor FILES ${PlanEditor_SRCS})
|
||||
|
||||
NGL_ADD_LIBRARY2(WS planEditor SHARED ${PlanEditor_SRCS} ${db_SNDS} )
|
||||
|
||||
NGL_TARGET_LINK_LIBRARIES(planEditor
|
||||
PRIVATE
|
||||
situationMap
|
||||
situationMapGeometryModel
|
||||
situationMapFunctionDialog
|
||||
advancedSymbology
|
||||
advancedSymbologyXML_Gui
|
||||
LtsCoordTrans
|
||||
LtsSession
|
||||
LtsSessionData
|
||||
NGLLogger
|
||||
Qt6::Xml
|
||||
ngltranslator
|
||||
|
||||
PUBLIC
|
||||
advancedSymbologyGui
|
||||
situationMapCommon
|
||||
LtsWidgets
|
||||
Qt6::Core
|
||||
Qt6::Widgets
|
||||
Qt6::WebEngineWidgets
|
||||
)
|
||||
if(QT6_GUI_AVAILABLE)
|
||||
NGL_TARGET_LINK_LIBRARIES(planEditor
|
||||
PRIVATE
|
||||
situationMap
|
||||
situationMapGeometryModel
|
||||
situationMapFunctionDialog
|
||||
advancedSymbology
|
||||
advancedSymbologyXML_Gui
|
||||
LtsCoordTrans
|
||||
LtsSession
|
||||
LtsSessionData
|
||||
NGLLogger
|
||||
Qt6::Xml
|
||||
ngltranslator
|
||||
|
||||
PUBLIC
|
||||
advancedSymbologyGui
|
||||
situationMapCommon
|
||||
LtsWidgets
|
||||
Qt6::Core
|
||||
${Qt6_Widgets}
|
||||
Qt6::WebEngineWidgets
|
||||
)
|
||||
endif()
|
||||
|
||||
NGL_INSTALL_TARGET(planEditor)
|
||||
|
||||
|
||||
+27
-17
@@ -5,6 +5,14 @@
|
||||
# Created by Jörg Turla, SPDG, 2017-04-24
|
||||
#
|
||||
|
||||
# Make ${Qt6_Widgets} optional
|
||||
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
|
||||
set(Qt6_Widgets ${Qt6_Widgets})
|
||||
else()
|
||||
set(Qt6_Widgets "")
|
||||
endif()
|
||||
|
||||
|
||||
SET (PlanEditorGuiPlugin_SRCS
|
||||
list_chooser.cpp
|
||||
list_chooser.h
|
||||
@@ -15,22 +23,24 @@ SET (PlanEditorGuiPlugin_SRCS
|
||||
SOURCE_GROUP(PlanEditorPlugin FILES ${PlanEditorGuiPlugin_SRCS})
|
||||
|
||||
NGL_ADD_LIBRARY(WS PlanEditorGuiPlugin MODULE ${PlanEditorGuiPlugin_SRCS})
|
||||
NGL_TARGET_LINK_LIBRARIES( PlanEditorGuiPlugin
|
||||
LtsSession
|
||||
LtsSessionData
|
||||
PlanEditorGuiPluginInterface
|
||||
planEditor
|
||||
svcPedDummy
|
||||
situationMap
|
||||
situationMapObjects
|
||||
GuiPluginInterface
|
||||
FlmDataPluginInterface
|
||||
OpmDataPluginInterface
|
||||
PpmDataPluginInterface
|
||||
LtsUtilsGuiDds
|
||||
LtsWidgets
|
||||
NGLLogger
|
||||
Qt6::Widgets
|
||||
)
|
||||
if(QT6_GUI_AVAILABLE)
|
||||
NGL_TARGET_LINK_LIBRARIES( PlanEditorGuiPlugin
|
||||
LtsSession
|
||||
LtsSessionData
|
||||
PlanEditorGuiPluginInterface
|
||||
planEditor
|
||||
svcPedDummy
|
||||
situationMap
|
||||
situationMapObjects
|
||||
GuiPluginInterface
|
||||
FlmDataPluginInterface
|
||||
OpmDataPluginInterface
|
||||
PpmDataPluginInterface
|
||||
LtsUtilsGuiDds
|
||||
LtsWidgets
|
||||
NGLLogger
|
||||
${Qt6_Widgets}
|
||||
)
|
||||
endif()
|
||||
|
||||
NGL_INSTALL_TARGET(PlanEditorGuiPlugin)
|
||||
@@ -6,6 +6,14 @@
|
||||
|
||||
# Situation Map Test Application
|
||||
|
||||
# Make ${Qt6_Gui} optional
|
||||
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Gui)
|
||||
set(Qt6_Gui ${Qt6_Gui})
|
||||
else()
|
||||
set(Qt6_Gui "")
|
||||
endif()
|
||||
|
||||
|
||||
FIND_PACKAGE(ArcGIS REQUIRED)
|
||||
|
||||
SET(EXE_SRCS
|
||||
@@ -26,22 +34,24 @@ NGL_WRAP_UI(EXE_SRCS ${EXE_UICS})
|
||||
SET(LOG4CXX_PROPS_FILE log4cxx_planEditorTest.props)
|
||||
|
||||
NGL_ADD_EXECUTABLE(WS planEditorTest ${EXE_SRCS} ${EXE_HDRS} ${EXE_UICS})
|
||||
NGL_TARGET_LINK_LIBRARIES(
|
||||
planEditorTest
|
||||
NGLLogger
|
||||
LtsSession
|
||||
LtsSessionData
|
||||
LtsWidgets
|
||||
nglapplication
|
||||
LtsPluginManager
|
||||
situationMap
|
||||
situationMapObjects
|
||||
situationMapFunctionDialog
|
||||
planEditor
|
||||
ArcGIS::ArcGIS
|
||||
LtsPluginLoader
|
||||
Qt6::Gui
|
||||
)
|
||||
if(QT6_GUI_AVAILABLE)
|
||||
NGL_TARGET_LINK_LIBRARIES(
|
||||
planEditorTest
|
||||
NGLLogger
|
||||
LtsSession
|
||||
LtsSessionData
|
||||
LtsWidgets
|
||||
nglapplication
|
||||
LtsPluginManager
|
||||
situationMap
|
||||
situationMapObjects
|
||||
situationMapFunctionDialog
|
||||
planEditor
|
||||
ArcGIS::ArcGIS
|
||||
LtsPluginLoader
|
||||
${Qt6_Gui}
|
||||
)
|
||||
endif()
|
||||
|
||||
IF(TARGET planEditorTest)
|
||||
|
||||
|
||||
Reference in new issue
Block a user