Adds latest migration results
This commit is contained in:
829 files changed
+35074
-70886
No files matched your search
@@ -7,6 +7,14 @@
|
||||
# Created by Mike Wille, SLSE, 2016-06-15
|
||||
#
|
||||
|
||||
# Make ${Qt6_Widgets} optional
|
||||
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
|
||||
set(Qt6_Widgets ${Qt6_Widgets})
|
||||
else()
|
||||
set(Qt6_Widgets "")
|
||||
endif()
|
||||
|
||||
|
||||
SET(ltsDataView_SRCS
|
||||
lts_data_view_export.h
|
||||
lts_data_view.h
|
||||
@@ -36,15 +44,17 @@ NGL_WRAP_UI(ltsDataView_SRCS
|
||||
|
||||
NGL_ADD_LIBRARY(WS LtsDataView SHARED ${ltsDataView_SRCS})
|
||||
|
||||
NGL_TARGET_LINK_LIBRARIES(LtsDataView
|
||||
PRIVATE
|
||||
LtsWidgets
|
||||
LtsUtilsSettings
|
||||
ngltools
|
||||
PUBLIC
|
||||
Qt6::Core
|
||||
Qt6::Widgets
|
||||
)
|
||||
if(QT6_GUI_AVAILABLE)
|
||||
NGL_TARGET_LINK_LIBRARIES(LtsDataView
|
||||
PRIVATE
|
||||
LtsWidgets
|
||||
LtsUtilsSettings
|
||||
ngltools
|
||||
PUBLIC
|
||||
Qt6::Core
|
||||
${Qt6_Widgets}
|
||||
)
|
||||
endif()
|
||||
NGL_TARGET_INCLUDE_DIRECTORIES(LtsDataView
|
||||
PUBLIC
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../
|
||||
@@ -54,8 +64,10 @@ NGL_INSTALL_TARGET(LtsDataView)
|
||||
|
||||
# Test-Executable
|
||||
NGL_ADD_EXECUTABLE(WS NO_TRANSLATION LtsDataViewTest test.h test.cpp)
|
||||
NGL_TARGET_LINK_LIBRARIES(LtsDataViewTest
|
||||
Qt6::Widgets
|
||||
LtsDataView
|
||||
LtsWidgets
|
||||
)
|
||||
if(QT6_GUI_AVAILABLE)
|
||||
NGL_TARGET_LINK_LIBRARIES(LtsDataViewTest
|
||||
${Qt6_Widgets}
|
||||
LtsDataView
|
||||
LtsWidgets
|
||||
)
|
||||
endif()
|
||||
@@ -7,6 +7,14 @@
|
||||
# Created by Iuliana Ojog, SLSE, 2017-07-12
|
||||
#
|
||||
|
||||
# Make ${Qt6_Widgets} optional
|
||||
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
|
||||
set(Qt6_Widgets ${Qt6_Widgets})
|
||||
else()
|
||||
set(Qt6_Widgets "")
|
||||
endif()
|
||||
|
||||
|
||||
SET(ltsFileDialog_SRCS
|
||||
lts_file_dialog_widget.h
|
||||
lts_file_dialog_widget.cpp
|
||||
@@ -23,23 +31,25 @@ NGL_WRAP_UI(ltsFileDialog_SRCS
|
||||
)
|
||||
|
||||
NGL_ADD_LIBRARY2(WS LtsFileDialog SHARED ${ltsFileDialog_SRCS})
|
||||
NGL_TARGET_LINK_LIBRARIES(LtsFileDialog
|
||||
PRIVATE
|
||||
LtsWidgets
|
||||
LtsDataView
|
||||
LtsSession
|
||||
LtsSessionData
|
||||
nglwidgets
|
||||
ngltools
|
||||
svcFlmCommon
|
||||
svcOpmCommon
|
||||
svcExmCommon
|
||||
LtsUtilsCoreHeaderOnly
|
||||
LtsUtilsGuiConnectDialog
|
||||
PUBLIC
|
||||
Qt6::Core
|
||||
Qt6::Widgets
|
||||
)
|
||||
if(QT6_GUI_AVAILABLE)
|
||||
NGL_TARGET_LINK_LIBRARIES(LtsFileDialog
|
||||
PRIVATE
|
||||
LtsWidgets
|
||||
LtsDataView
|
||||
LtsSession
|
||||
LtsSessionData
|
||||
nglwidgets
|
||||
ngltools
|
||||
svcFlmCommon
|
||||
svcOpmCommon
|
||||
svcExmCommon
|
||||
LtsUtilsCoreHeaderOnly
|
||||
LtsUtilsGuiConnectDialog
|
||||
PUBLIC
|
||||
Qt6::Core
|
||||
${Qt6_Widgets}
|
||||
)
|
||||
endif()
|
||||
NGL_TARGET_INCLUDE_DIRECTORIES(LtsFileDialog
|
||||
PUBLIC
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../
|
||||
@@ -49,22 +59,24 @@ NGL_TARGET_INCLUDE_DIRECTORIES(LtsFileDialog
|
||||
|
||||
# Test-Executable
|
||||
NGL_ADD_EXECUTABLE(WS NO_TRANSLATION LtsFileDialogTest test.cpp)
|
||||
NGL_TARGET_LINK_LIBRARIES(LtsFileDialogTest
|
||||
PRIVATE
|
||||
LtsFileDialog
|
||||
LtsWidgets
|
||||
LtsDataView
|
||||
LtsSession
|
||||
LtsSessionData
|
||||
nglwidgets
|
||||
ngltools
|
||||
nglcoreapplication
|
||||
svcFlmClient
|
||||
svcOpmClient
|
||||
svcExmClient
|
||||
# RTI::nddscpp2
|
||||
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
|
||||
PUBLIC
|
||||
Qt6::Core
|
||||
Qt6::Widgets
|
||||
)
|
||||
if(QT6_GUI_AVAILABLE)
|
||||
NGL_TARGET_LINK_LIBRARIES(LtsFileDialogTest
|
||||
PRIVATE
|
||||
LtsFileDialog
|
||||
LtsWidgets
|
||||
LtsDataView
|
||||
LtsSession
|
||||
LtsSessionData
|
||||
nglwidgets
|
||||
ngltools
|
||||
nglcoreapplication
|
||||
svcFlmClient
|
||||
svcOpmClient
|
||||
svcExmClient
|
||||
# RTI::nddscpp2
|
||||
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
|
||||
PUBLIC
|
||||
Qt6::Core
|
||||
${Qt6_Widgets}
|
||||
)
|
||||
endif()
|
||||
@@ -7,6 +7,14 @@
|
||||
# Created by Iuliana Ojog, SLSE, 2017-07-12
|
||||
#
|
||||
|
||||
# Make ${Qt6_Widgets} optional
|
||||
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
|
||||
set(Qt6_Widgets ${Qt6_Widgets})
|
||||
else()
|
||||
set(Qt6_Widgets "")
|
||||
endif()
|
||||
|
||||
|
||||
FIND_PACKAGE(KDReports REQUIRED)
|
||||
|
||||
SET(ltsReportDisplay_SRCS
|
||||
@@ -15,13 +23,15 @@ SET(ltsReportDisplay_SRCS
|
||||
)
|
||||
|
||||
NGL_ADD_LIBRARY2(WS LtsReportDisplay SHARED ${ltsReportDisplay_SRCS})
|
||||
NGL_TARGET_LINK_LIBRARIES(LtsReportDisplay
|
||||
PRIVATE
|
||||
LtsWidgets
|
||||
PUBLIC
|
||||
Qt6::Widgets
|
||||
KDReports::KDReports
|
||||
)
|
||||
if(QT6_GUI_AVAILABLE)
|
||||
NGL_TARGET_LINK_LIBRARIES(LtsReportDisplay
|
||||
PRIVATE
|
||||
LtsWidgets
|
||||
PUBLIC
|
||||
${Qt6_Widgets}
|
||||
KDReports::KDReports
|
||||
)
|
||||
endif()
|
||||
NGL_TARGET_INCLUDE_DIRECTORIES(LtsReportDisplay
|
||||
PUBLIC
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../
|
||||
|
||||
@@ -6,6 +6,14 @@
|
||||
|
||||
# LIBRARY
|
||||
|
||||
# Make ${Qt6_Widgets} optional
|
||||
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
|
||||
set(Qt6_Widgets ${Qt6_Widgets})
|
||||
else()
|
||||
set(Qt6_Widgets "")
|
||||
endif()
|
||||
|
||||
|
||||
SET(Symbology_SRCS
|
||||
sidc_codec.cpp
|
||||
|
||||
@@ -71,22 +79,24 @@ NGL_TARGET_INCLUDE_DIRECTORIES(advancedSymbology
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/..
|
||||
)
|
||||
|
||||
NGL_TARGET_LINK_LIBRARIES(advancedSymbology
|
||||
PRIVATE
|
||||
ArcGIS::ArcGIS
|
||||
Qt6::Concurrent
|
||||
ngltools # DTG
|
||||
situationMapCommon
|
||||
LtsDataView
|
||||
LtsSessionData
|
||||
LtsUtilsCoreHeaderOnly
|
||||
|
||||
PUBLIC
|
||||
advancedSymbologyXML
|
||||
NGLLogger
|
||||
Qt6::Core
|
||||
Qt6::Widgets
|
||||
)
|
||||
if(QT6_GUI_AVAILABLE)
|
||||
NGL_TARGET_LINK_LIBRARIES(advancedSymbology
|
||||
PRIVATE
|
||||
ArcGIS::ArcGIS
|
||||
Qt6::Concurrent
|
||||
ngltools # DTG
|
||||
situationMapCommon
|
||||
LtsDataView
|
||||
LtsSessionData
|
||||
LtsUtilsCoreHeaderOnly
|
||||
|
||||
PUBLIC
|
||||
advancedSymbologyXML
|
||||
NGLLogger
|
||||
Qt6::Core
|
||||
${Qt6_Widgets}
|
||||
)
|
||||
endif()
|
||||
|
||||
|
||||
IF(BUILD_TESTING AND BUILD_SITMAP_UNIT_TESTS AND TARGET situationMapCommon)
|
||||
@@ -100,21 +110,23 @@ IF(BUILD_TESTING AND BUILD_SITMAP_UNIT_TESTS AND TARGET situationMapCommon)
|
||||
# INTERFACE
|
||||
# ${CMAKE_CURRENT_SOURCE_DIR}
|
||||
)
|
||||
NGL_TARGET_LINK_LIBRARIES(advancedSymbology_static
|
||||
PRIVATE
|
||||
NGLLogger
|
||||
ArcGIS::ArcGIS
|
||||
Qt6::Concurrent
|
||||
PUBLIC
|
||||
advancedSymbologyXML
|
||||
Qt6::Core
|
||||
Qt6::Widgets
|
||||
|
||||
LtsDataView
|
||||
LtsSessionData
|
||||
LtsUtilsCoreHeaderOnly
|
||||
|
||||
)
|
||||
if(QT6_GUI_AVAILABLE)
|
||||
NGL_TARGET_LINK_LIBRARIES(advancedSymbology_static
|
||||
PRIVATE
|
||||
NGLLogger
|
||||
ArcGIS::ArcGIS
|
||||
Qt6::Concurrent
|
||||
PUBLIC
|
||||
advancedSymbologyXML
|
||||
Qt6::Core
|
||||
${Qt6_Widgets}
|
||||
|
||||
LtsDataView
|
||||
LtsSessionData
|
||||
LtsUtilsCoreHeaderOnly
|
||||
|
||||
)
|
||||
endif()
|
||||
|
||||
ENDIF()
|
||||
|
||||
|
||||
+27
-10
@@ -6,6 +6,21 @@
|
||||
|
||||
# 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(SymbologyXML_SRCS
|
||||
attribute_data.h
|
||||
symbology_xml_export.h
|
||||
@@ -42,16 +57,18 @@ NGL_TARGET_INCLUDE_DIRECTORIES(advancedSymbologyXML
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/..
|
||||
)
|
||||
|
||||
NGL_TARGET_LINK_LIBRARIES(advancedSymbologyXML
|
||||
PRIVATE
|
||||
situationMapCommon
|
||||
Qt6::Gui
|
||||
Qt6::Widgets
|
||||
PUBLIC
|
||||
LtsWidgets
|
||||
NGLLogger
|
||||
Qt6::Core
|
||||
)
|
||||
if(QT6_GUI_AVAILABLE)
|
||||
NGL_TARGET_LINK_LIBRARIES(advancedSymbologyXML
|
||||
PRIVATE
|
||||
situationMapCommon
|
||||
${Qt6_Gui}
|
||||
${Qt6_Widgets}
|
||||
PUBLIC
|
||||
LtsWidgets
|
||||
NGLLogger
|
||||
Qt6::Core
|
||||
)
|
||||
endif()
|
||||
|
||||
NGL_INSTALL_TARGET(advancedSymbologyXML)
|
||||
|
||||
|
||||
+22
-12
@@ -6,6 +6,14 @@
|
||||
|
||||
# LIBRARY
|
||||
|
||||
# Make ${Qt6_Gui} optional
|
||||
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Gui)
|
||||
set(Qt6_Gui ${Qt6_Gui})
|
||||
else()
|
||||
set(Qt6_Gui "")
|
||||
endif()
|
||||
|
||||
|
||||
SET(SymbologyXML_Gui_SRCS
|
||||
symbology_xml_gui_export.h
|
||||
symbol_dialog.cpp
|
||||
@@ -24,18 +32,20 @@ NGL_TARGET_INCLUDE_DIRECTORIES(advancedSymbologyXML_Gui
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../../../../Common
|
||||
)
|
||||
|
||||
NGL_TARGET_LINK_LIBRARIES(advancedSymbologyXML_Gui
|
||||
PRIVATE
|
||||
situationMapCommon
|
||||
situationMapGeometryModel
|
||||
advancedSymbology
|
||||
NGLLogger
|
||||
Qt6::Gui
|
||||
PUBLIC
|
||||
LtsWidgets
|
||||
NGLLogger
|
||||
Qt6::Core
|
||||
)
|
||||
if(QT6_GUI_AVAILABLE)
|
||||
NGL_TARGET_LINK_LIBRARIES(advancedSymbologyXML_Gui
|
||||
PRIVATE
|
||||
situationMapCommon
|
||||
situationMapGeometryModel
|
||||
advancedSymbology
|
||||
NGLLogger
|
||||
${Qt6_Gui}
|
||||
PUBLIC
|
||||
LtsWidgets
|
||||
NGLLogger
|
||||
Qt6::Core
|
||||
)
|
||||
endif()
|
||||
|
||||
NGL_INSTALL_TARGET(advancedSymbologyXML_Gui)
|
||||
|
||||
Reference in new issue
Block a user