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 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
|
||||
aar_application.cpp
|
||||
aar_application.h
|
||||
@@ -19,18 +27,20 @@ NGL_WRAP_UI(SRCS aarApp.ui)
|
||||
|
||||
NGL_ADD_EXECUTABLE(AAR aarApp ${SRCS})
|
||||
|
||||
NGL_TARGET_LINK_LIBRARIES(aarApp
|
||||
Qt6::Widgets
|
||||
Qt6::Core
|
||||
nglapplication
|
||||
ngldb
|
||||
nglcoreapplication
|
||||
ngltools
|
||||
ngltranslator
|
||||
nglwidgets
|
||||
NGLLogger
|
||||
LtsCommandLineParser
|
||||
)
|
||||
if(QT6_GUI_AVAILABLE)
|
||||
NGL_TARGET_LINK_LIBRARIES(aarApp
|
||||
${Qt6_Widgets}
|
||||
Qt6::Core
|
||||
nglapplication
|
||||
ngldb
|
||||
nglcoreapplication
|
||||
ngltools
|
||||
ngltranslator
|
||||
nglwidgets
|
||||
NGLLogger
|
||||
LtsCommandLineParser
|
||||
)
|
||||
endif()
|
||||
|
||||
NGL_INSTALL_TARGET(aarApp)
|
||||
NGL_INSTALL(AAR FILES log4cxx_aarApp.props DESTINATION bin)
|
||||
|
||||
@@ -4,6 +4,14 @@
|
||||
# $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(mwt_SRCS
|
||||
@@ -28,26 +36,28 @@ ELSE()
|
||||
NGL_ADD_EXECUTABLE(WS OperatorApplication ${mwt_SRCS})
|
||||
ENDIF()
|
||||
|
||||
NGL_TARGET_LINK_LIBRARIES(OperatorApplication
|
||||
ArcGISQt5Hack # make sure it's loaded *before* libEsriCommonQt.so
|
||||
Qt6::Widgets
|
||||
Qt6::Network
|
||||
nglapplication
|
||||
LtsCommandLineParser
|
||||
NGLLogger
|
||||
LtsSession
|
||||
LtsPluginLoader
|
||||
LtsAppDescriptor
|
||||
LtsAppManager
|
||||
LtsSessionData
|
||||
LtsUtilsSettings
|
||||
ngltranslator
|
||||
nglsettings
|
||||
LtsProjectionWorkstation
|
||||
LtsMultiMonitor # TODO: rm if -m is out
|
||||
LtsUtilsGuiConnectDialog # to set timeout if -v is set
|
||||
LtsUtilsGuiStyleManager
|
||||
)
|
||||
if(QT6_GUI_AVAILABLE)
|
||||
NGL_TARGET_LINK_LIBRARIES(OperatorApplication
|
||||
ArcGISQt5Hack # make sure it's loaded *before* libEsriCommonQt.so
|
||||
${Qt6_Widgets}
|
||||
Qt6::Network
|
||||
nglapplication
|
||||
LtsCommandLineParser
|
||||
NGLLogger
|
||||
LtsSession
|
||||
LtsPluginLoader
|
||||
LtsAppDescriptor
|
||||
LtsAppManager
|
||||
LtsSessionData
|
||||
LtsUtilsSettings
|
||||
ngltranslator
|
||||
nglsettings
|
||||
LtsProjectionWorkstation
|
||||
LtsMultiMonitor # TODO: rm if -m is out
|
||||
LtsUtilsGuiConnectDialog # to set timeout if -v is set
|
||||
LtsUtilsGuiStyleManager
|
||||
)
|
||||
endif()
|
||||
NGL_INSTALL_TARGET(OperatorApplication)
|
||||
|
||||
NGL_INSTALL(FILES WS ${LOG4CXX_PROPS_FILE} DESTINATION "bin")
|
||||
@@ -1,6 +1,21 @@
|
||||
#
|
||||
# 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)
|
||||
|
||||
# Make VLC optional - only try to find it if user explicitly enables it
|
||||
@@ -91,51 +106,53 @@ NGL_TARGET_COMPILE_DEFINITIONS(thp_viewer
|
||||
PRIVATE
|
||||
)
|
||||
ENDIF()
|
||||
NGL_TARGET_LINK_LIBRARIES(thp_viewer
|
||||
ArcGISQt5Hack # make sure it's loaded *before* libEsriCommonQt.so
|
||||
|
||||
Qt6::Core
|
||||
Qt6::Gui
|
||||
Qt6::PrintSupport
|
||||
Qt6::Svg
|
||||
Qt6::WebEngineCore
|
||||
Qt6::WebEngineWidgets
|
||||
Qt6::Widgets
|
||||
Qt6::Xml
|
||||
|
||||
RmeLightStyleQrc
|
||||
|
||||
AsbData
|
||||
AsbForeignDataPluginThp
|
||||
BuildingViewerCommon
|
||||
FltAesGuiCommon
|
||||
FltAesWidget
|
||||
FltBldgCmpntWidget
|
||||
FltParticipantWidget
|
||||
IsmDataPluginThp
|
||||
LtsCoordTrans
|
||||
LtsCommandLineParser
|
||||
NGLLogger
|
||||
nglsingleapplication
|
||||
ngltools
|
||||
ngltranslator
|
||||
nglwidgets
|
||||
PdmComboBoxGui
|
||||
PpmComboBoxGui
|
||||
SitmapDds
|
||||
SituationReplaySqlite
|
||||
|
||||
svcFlmCommon
|
||||
|
||||
svcAesClient
|
||||
svcBldClient
|
||||
svcCesClient
|
||||
svcGimClient
|
||||
$<IF:$<TARGET_EXISTS:svcIsmClient>,svcIsmClient,>
|
||||
svcPpmClient
|
||||
svcPdmClient
|
||||
svcAlmClient
|
||||
)
|
||||
if(QT6_GUI_AVAILABLE)
|
||||
NGL_TARGET_LINK_LIBRARIES(thp_viewer
|
||||
ArcGISQt5Hack # make sure it's loaded *before* libEsriCommonQt.so
|
||||
|
||||
Qt6::Core
|
||||
${Qt6_Gui}
|
||||
Qt6::PrintSupport
|
||||
Qt6::Svg
|
||||
Qt6::WebEngineCore
|
||||
Qt6::WebEngineWidgets
|
||||
${Qt6_Widgets}
|
||||
Qt6::Xml
|
||||
|
||||
RmeLightStyleQrc
|
||||
|
||||
AsbData
|
||||
AsbForeignDataPluginThp
|
||||
BuildingViewerCommon
|
||||
FltAesGuiCommon
|
||||
FltAesWidget
|
||||
FltBldgCmpntWidget
|
||||
FltParticipantWidget
|
||||
IsmDataPluginThp
|
||||
LtsCoordTrans
|
||||
LtsCommandLineParser
|
||||
NGLLogger
|
||||
nglsingleapplication
|
||||
ngltools
|
||||
ngltranslator
|
||||
nglwidgets
|
||||
PdmComboBoxGui
|
||||
PpmComboBoxGui
|
||||
SitmapDds
|
||||
SituationReplaySqlite
|
||||
|
||||
svcFlmCommon
|
||||
|
||||
svcAesClient
|
||||
svcBldClient
|
||||
svcCesClient
|
||||
svcGimClient
|
||||
$<IF:$<TARGET_EXISTS:svcIsmClient>,svcIsmClient,>
|
||||
svcPpmClient
|
||||
svcPdmClient
|
||||
svcAlmClient
|
||||
)
|
||||
endif()
|
||||
IF(VLC_FOUND)
|
||||
NGL_TARGET_LINK_LIBRARIES(thp_viewer
|
||||
$<$<TARGET_EXISTS:PkgConfig::VLC>:PkgConfig::VLC>
|
||||
|
||||
Reference in new issue
Block a user