Adds latest migration results
This commit is contained in:
829 files changed
+35074
-70886
No files matched your search
@@ -6,9 +6,9 @@
|
||||
#
|
||||
|
||||
IF(${CMAKE_VERSION} VERSION_LESS "3.6.0")
|
||||
FIND_PACKAGE(Boost REQUIRED COMPONENTS system) # system wird nicht gebraucht, aber ohne Komponente wird das Boost::boost imported Target nicht angelegt (cmake <= 3.5.2)
|
||||
FIND_PACKAGE(Boost COMPONENTS system) # system wird nicht gebraucht, aber ohne Komponente wird das Boost::boost imported Target nicht angelegt (cmake <= 3.5.2)
|
||||
ELSE()
|
||||
FIND_PACKAGE(Boost REQUIRED)
|
||||
FIND_PACKAGE(Boost)
|
||||
ENDIF()
|
||||
|
||||
ADD_SUBDIRECTORY(Data)
|
||||
@@ -22,7 +22,7 @@ ADD_SUBDIRECTORY(Shared)
|
||||
ADD_INTERFACE_LIBRARY(AvmMenuEditGuiPluginInterface
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/avm_menu_edit_gui_plugin_interface.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/..
|
||||
GuiPluginInterface TopicReplayInterface TopicEditorInterface Qt6::Core AvmShared Boost::boost
|
||||
GuiPluginInterface TopicReplayInterface TopicEditorInterface Qt6::Core AvmShared $<IF:$<TARGET_EXISTS:Boost::boost>,Boost::boost,>
|
||||
)
|
||||
|
||||
#
|
||||
|
||||
@@ -41,6 +41,6 @@ NGL_TARGET_LINK_LIBRARIES(AvmDataPlugin
|
||||
LtsUtilsGuiStyleManager
|
||||
LtsUtilsGuiConnectDialog
|
||||
LtsUtilsSettings
|
||||
Boost::boost
|
||||
$<IF:$<TARGET_EXISTS:Boost::boost>,Boost::boost,>
|
||||
)
|
||||
NGL_INSTALL_TARGET(AvmDataPlugin)
|
||||
+36
-26
@@ -5,6 +5,14 @@
|
||||
# Created by Patric Karwat, SLSE, 2016-10-05
|
||||
#
|
||||
|
||||
# Make ${Qt6_Widgets} optional
|
||||
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
|
||||
set(Qt6_Widgets ${Qt6_Widgets})
|
||||
else()
|
||||
set(Qt6_Widgets "")
|
||||
endif()
|
||||
|
||||
|
||||
SET(avm_menu_edit_gui_SRCS
|
||||
avm_menu_edit_gui_plugin.cpp
|
||||
avm_menu_edit_gui_plugin.h
|
||||
@@ -56,31 +64,33 @@ NGL_WRAP_UI(avm_menu_edit_gui_SRCS
|
||||
)
|
||||
|
||||
NGL_ADD_LIBRARY(WS avmMenuEditGuiPlugin MODULE ${avm_menu_edit_gui_SRCS})
|
||||
NGL_TARGET_LINK_LIBRARIES(avmMenuEditGuiPlugin
|
||||
AvmDataPluginInterface
|
||||
AvmMenuEditGuiPluginInterface
|
||||
AvmShared
|
||||
FlmDataPluginInterface
|
||||
IsmDataPluginInterface
|
||||
LtsDataView
|
||||
LtsPrinting
|
||||
LtsScriptTimeline
|
||||
LtsSession
|
||||
LtsSessionData
|
||||
LtsUtilsGuiDds
|
||||
LtsUtilsCore
|
||||
LtsWidgets
|
||||
LtsUtilsSettings
|
||||
nglsettings
|
||||
MrkCommon
|
||||
MrkDataPluginInterface
|
||||
NGLLogger
|
||||
ngltools
|
||||
nglwidgets
|
||||
OpmDataPluginInterface
|
||||
Qt6::Widgets
|
||||
TopicEditorBase
|
||||
Boost::boost
|
||||
)
|
||||
if(QT6_GUI_AVAILABLE)
|
||||
NGL_TARGET_LINK_LIBRARIES(avmMenuEditGuiPlugin
|
||||
AvmDataPluginInterface
|
||||
AvmMenuEditGuiPluginInterface
|
||||
AvmShared
|
||||
FlmDataPluginInterface
|
||||
IsmDataPluginInterface
|
||||
LtsDataView
|
||||
LtsPrinting
|
||||
LtsScriptTimeline
|
||||
LtsSession
|
||||
LtsSessionData
|
||||
LtsUtilsGuiDds
|
||||
LtsUtilsCore
|
||||
LtsWidgets
|
||||
LtsUtilsSettings
|
||||
nglsettings
|
||||
MrkCommon
|
||||
MrkDataPluginInterface
|
||||
NGLLogger
|
||||
ngltools
|
||||
nglwidgets
|
||||
OpmDataPluginInterface
|
||||
${Qt6_Widgets}
|
||||
TopicEditorBase
|
||||
$<IF:$<TARGET_EXISTS:Boost::boost>,Boost::boost,>
|
||||
)
|
||||
endif()
|
||||
|
||||
NGL_INSTALL_TARGET(avmMenuEditGuiPlugin)
|
||||
+31
-21
@@ -5,6 +5,14 @@
|
||||
# Created by Hannes Baeuerle, SLSE, 2017-08-18
|
||||
#
|
||||
|
||||
# Make ${Qt6_Widgets} optional
|
||||
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
|
||||
set(Qt6_Widgets ${Qt6_Widgets})
|
||||
else()
|
||||
set(Qt6_Widgets "")
|
||||
endif()
|
||||
|
||||
|
||||
SET(avm_combat_net_radio_gui_SRCS
|
||||
CombatNetRadioConfiguration/avm_cnr_json_helper.h
|
||||
CombatNetRadioConfiguration/avm_cnr_json_helper.cpp
|
||||
@@ -76,26 +84,28 @@ NGL_WRAP_UI(avm_combat_net_radio_gui_SRCS
|
||||
)
|
||||
|
||||
NGL_ADD_LIBRARY(WS avmCombatNetRadioGuiPlugin MODULE ${avm_combat_net_radio_gui_SRCS})
|
||||
NGL_TARGET_LINK_LIBRARIES(avmCombatNetRadioGuiPlugin
|
||||
svcCnrHelper
|
||||
LtsPrinting
|
||||
nglwidgets
|
||||
NGLLogger
|
||||
ngltools
|
||||
LtsSession
|
||||
LtsSessionData
|
||||
AvmDataPluginInterface
|
||||
ExmDataPluginInterface
|
||||
PpmDataPluginInterface
|
||||
FlmDataPluginInterface
|
||||
svcAvmCommon
|
||||
AvmShared
|
||||
svcExmClient
|
||||
Qt6::Widgets
|
||||
LtsWidgets
|
||||
LtsDataView
|
||||
LtsUtilsGuiDds
|
||||
LtsUtilsSettings
|
||||
)
|
||||
if(QT6_GUI_AVAILABLE)
|
||||
NGL_TARGET_LINK_LIBRARIES(avmCombatNetRadioGuiPlugin
|
||||
svcCnrHelper
|
||||
LtsPrinting
|
||||
nglwidgets
|
||||
NGLLogger
|
||||
ngltools
|
||||
LtsSession
|
||||
LtsSessionData
|
||||
AvmDataPluginInterface
|
||||
ExmDataPluginInterface
|
||||
PpmDataPluginInterface
|
||||
FlmDataPluginInterface
|
||||
svcAvmCommon
|
||||
AvmShared
|
||||
svcExmClient
|
||||
${Qt6_Widgets}
|
||||
LtsWidgets
|
||||
LtsDataView
|
||||
LtsUtilsGuiDds
|
||||
LtsUtilsSettings
|
||||
)
|
||||
endif()
|
||||
|
||||
NGL_INSTALL_TARGET(avmCombatNetRadioGuiPlugin)
|
||||
+25
-15
@@ -5,6 +5,14 @@
|
||||
# Created by Astrid Mueller, SGAS, 2017-10-17
|
||||
#
|
||||
|
||||
# Make ${Qt6_Widgets} optional
|
||||
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
|
||||
set(Qt6_Widgets ${Qt6_Widgets})
|
||||
else()
|
||||
set(Qt6_Widgets "")
|
||||
endif()
|
||||
|
||||
|
||||
SET(avm_eloka_gui_SRCS
|
||||
avm_eloka_gui_plugin.cpp
|
||||
avm_eloka_gui_plugin.h
|
||||
@@ -22,20 +30,22 @@ NGL_WRAP_UI(avm_eloka_gui_SRCS
|
||||
)
|
||||
|
||||
NGL_ADD_LIBRARY(WS AvmElokaGuiPlugin MODULE ${avm_eloka_gui_SRCS})
|
||||
NGL_TARGET_LINK_LIBRARIES(AvmElokaGuiPlugin
|
||||
LtsPrinting
|
||||
NGLLogger
|
||||
LtsSession
|
||||
LtsSessionData
|
||||
LtsUtilsSettings
|
||||
AvmDataPluginInterface
|
||||
PpmDataPluginInterface
|
||||
svcAvmCommon
|
||||
Qt6::Widgets
|
||||
LtsWidgets
|
||||
LtsDataView
|
||||
LtsUtilsGuiDds
|
||||
ngltools
|
||||
)
|
||||
if(QT6_GUI_AVAILABLE)
|
||||
NGL_TARGET_LINK_LIBRARIES(AvmElokaGuiPlugin
|
||||
LtsPrinting
|
||||
NGLLogger
|
||||
LtsSession
|
||||
LtsSessionData
|
||||
LtsUtilsSettings
|
||||
AvmDataPluginInterface
|
||||
PpmDataPluginInterface
|
||||
svcAvmCommon
|
||||
${Qt6_Widgets}
|
||||
LtsWidgets
|
||||
LtsDataView
|
||||
LtsUtilsGuiDds
|
||||
ngltools
|
||||
)
|
||||
endif()
|
||||
|
||||
NGL_INSTALL_TARGET(AvmElokaGuiPlugin)
|
||||
+25
-15
@@ -5,6 +5,14 @@
|
||||
# Created by hjl, SLSE, 2016-12-01
|
||||
#
|
||||
|
||||
# Make ${Qt6_Widgets} optional
|
||||
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
|
||||
set(Qt6_Widgets ${Qt6_Widgets})
|
||||
else()
|
||||
set(Qt6_Widgets "")
|
||||
endif()
|
||||
|
||||
|
||||
SET(mvs_gui_SRCS
|
||||
avm_mvs_video_team_gui_plugin.h
|
||||
avm_mvs_video_team_gui_plugin.cpp
|
||||
@@ -31,20 +39,22 @@ QT5_WRAP_UI(mvs_gui_SRCS
|
||||
)
|
||||
|
||||
NGL_ADD_LIBRARY(WS MvsVideoTeamGuiPlugin MODULE ${mvs_gui_SRCS})
|
||||
NGL_TARGET_LINK_LIBRARIES(MvsVideoTeamGuiPlugin
|
||||
# LtsPrinting
|
||||
Qt6::Widgets
|
||||
LtsWidgets
|
||||
LtsDataView
|
||||
LtsPrinting
|
||||
AvmDataPluginInterface
|
||||
AvmMvsVideoTeamGuiPluginInterface
|
||||
IsmDataPluginInterface
|
||||
FlmDataPluginInterface
|
||||
|
||||
LtsSession
|
||||
LtsUtilsGuiDds
|
||||
LtsUtilsSettings
|
||||
)
|
||||
if(QT6_GUI_AVAILABLE)
|
||||
NGL_TARGET_LINK_LIBRARIES(MvsVideoTeamGuiPlugin
|
||||
# LtsPrinting
|
||||
${Qt6_Widgets}
|
||||
LtsWidgets
|
||||
LtsDataView
|
||||
LtsPrinting
|
||||
AvmDataPluginInterface
|
||||
AvmMvsVideoTeamGuiPluginInterface
|
||||
IsmDataPluginInterface
|
||||
FlmDataPluginInterface
|
||||
|
||||
LtsSession
|
||||
LtsUtilsGuiDds
|
||||
LtsUtilsSettings
|
||||
)
|
||||
endif()
|
||||
|
||||
NGL_INSTALL_TARGET(MvsVideoTeamGuiPlugin)
|
||||
+28
-18
@@ -5,6 +5,14 @@
|
||||
# Created by Hannes Baeuerle, SLSE, 2017-08-18
|
||||
#
|
||||
|
||||
# Make ${Qt6_Widgets} optional
|
||||
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
|
||||
set(Qt6_Widgets ${Qt6_Widgets})
|
||||
else()
|
||||
set(Qt6_Widgets "")
|
||||
endif()
|
||||
|
||||
|
||||
SET(avm_tvc_gui_SRCS
|
||||
avm_training_voice_gui_plugin.cpp
|
||||
avm_training_voice_gui_plugin.h
|
||||
@@ -22,23 +30,25 @@ NGL_WRAP_UI(avm_tvc_gui_SRCS
|
||||
)
|
||||
|
||||
NGL_ADD_LIBRARY(WS avmTrainingVoiceGuiPlugin MODULE ${avm_tvc_gui_SRCS})
|
||||
NGL_TARGET_LINK_LIBRARIES(avmTrainingVoiceGuiPlugin
|
||||
LtsPrinting
|
||||
nglwidgets
|
||||
NGLLogger
|
||||
ngltools
|
||||
LtsSession
|
||||
LtsSessionData
|
||||
AvmDataPluginInterface
|
||||
FlmDataPluginInterface
|
||||
svcAvmCommon
|
||||
AvmShared
|
||||
svcExmClient
|
||||
Qt6::Widgets
|
||||
LtsWidgets
|
||||
LtsDataView
|
||||
LtsUtilsGuiDds
|
||||
LtsUtilsSettings
|
||||
)
|
||||
if(QT6_GUI_AVAILABLE)
|
||||
NGL_TARGET_LINK_LIBRARIES(avmTrainingVoiceGuiPlugin
|
||||
LtsPrinting
|
||||
nglwidgets
|
||||
NGLLogger
|
||||
ngltools
|
||||
LtsSession
|
||||
LtsSessionData
|
||||
AvmDataPluginInterface
|
||||
FlmDataPluginInterface
|
||||
svcAvmCommon
|
||||
AvmShared
|
||||
svcExmClient
|
||||
${Qt6_Widgets}
|
||||
LtsWidgets
|
||||
LtsDataView
|
||||
LtsUtilsGuiDds
|
||||
LtsUtilsSettings
|
||||
)
|
||||
endif()
|
||||
|
||||
NGL_INSTALL_TARGET(avmTrainingVoiceGuiPlugin)
|
||||
+22
-12
@@ -6,6 +6,14 @@
|
||||
# Created by Christian Fröbel, NLSE, 2018-04-19
|
||||
#
|
||||
|
||||
# Make ${Qt6_Gui} optional
|
||||
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Gui)
|
||||
set(Qt6_Gui ${Qt6_Gui})
|
||||
else()
|
||||
set(Qt6_Gui "")
|
||||
endif()
|
||||
|
||||
|
||||
IF(BUILD_RTI)
|
||||
|
||||
set(SRCS
|
||||
@@ -32,18 +40,20 @@ NGL_TARGET_INCLUDE_DIRECTORIES(AvmShared
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../../Services/
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../../Common/
|
||||
)
|
||||
NGL_TARGET_LINK_LIBRARIES(AvmShared
|
||||
PUBLIC
|
||||
Qt6::Core
|
||||
svcAvmCommon
|
||||
Boost::boost
|
||||
PRIVATE
|
||||
LtsMultiMonitor
|
||||
LtsUtilsSettings
|
||||
Qt6::Gui
|
||||
nglsettings
|
||||
ngltools
|
||||
)
|
||||
if(QT6_GUI_AVAILABLE)
|
||||
NGL_TARGET_LINK_LIBRARIES(AvmShared
|
||||
PUBLIC
|
||||
Qt6::Core
|
||||
svcAvmCommon
|
||||
$<IF:$<TARGET_EXISTS:Boost::boost>,Boost::boost,>
|
||||
PRIVATE
|
||||
LtsMultiMonitor
|
||||
LtsUtilsSettings
|
||||
${Qt6_Gui}
|
||||
nglsettings
|
||||
ngltools
|
||||
)
|
||||
endif()
|
||||
NGL_INSTALL_TARGET(AvmShared)
|
||||
|
||||
ENDIF(BUILD_RTI)
|
||||
Reference in new issue
Block a user