Adds latest migration results
This commit is contained in:
829 files changed
+35074
-70886
No files matched your search
+9
-1
@@ -4,6 +4,14 @@
|
||||
# $Author:
|
||||
#
|
||||
|
||||
# Make ${Qt6_WebSockets} optional
|
||||
if(QT6_GUI_AVAILABLE AND TARGET Qt6::WebSockets)
|
||||
set(Qt6_WebSockets ${Qt6_WebSockets})
|
||||
else()
|
||||
set(Qt6_WebSockets "")
|
||||
endif()
|
||||
|
||||
|
||||
ADD_SUBDIRECTORY(BSM)
|
||||
ADD_SUBDIRECTORY(Json)
|
||||
ADD_SUBDIRECTORY(VWM)
|
||||
@@ -48,7 +56,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(BuildingControlCommon
|
||||
NGL_ADD_EXECUTABLE(AAR SV BuildingControlUnit ${bc_SRCS})
|
||||
NGL_TARGET_LINK_LIBRARIES(BuildingControlUnit
|
||||
Qt6::Core
|
||||
Qt6::WebSockets
|
||||
${Qt6_WebSockets}
|
||||
# Qt6::Test
|
||||
Qt6::Xml
|
||||
Qt6::Network
|
||||
|
||||
+9
-1
@@ -4,6 +4,14 @@
|
||||
# $Author$
|
||||
#
|
||||
|
||||
# Make ${Qt6_WebSockets} optional
|
||||
if(QT6_GUI_AVAILABLE AND TARGET Qt6::WebSockets)
|
||||
set(Qt6_WebSockets ${Qt6_WebSockets})
|
||||
else()
|
||||
set(Qt6_WebSockets "")
|
||||
endif()
|
||||
|
||||
|
||||
SET(json_SRCS
|
||||
json_api.cpp
|
||||
json_api.h
|
||||
@@ -14,7 +22,7 @@ SET(json_SRCS
|
||||
NGL_ADD_LIBRARY2(AAR SV BuildingControlJson SHARED ${json_SRCS})
|
||||
NGL_TARGET_LINK_LIBRARIES(BuildingControlJson
|
||||
PRIVATE
|
||||
Qt6::WebSockets
|
||||
${Qt6_WebSockets}
|
||||
PUBLIC
|
||||
Qt6::Core
|
||||
Qt6::Network
|
||||
|
||||
+32
-20
@@ -4,6 +4,14 @@
|
||||
# $Author$
|
||||
#
|
||||
|
||||
# Make ${Qt6_Gui} optional
|
||||
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Gui)
|
||||
set(Qt6_Gui ${Qt6_Gui})
|
||||
else()
|
||||
set(Qt6_Gui "")
|
||||
endif()
|
||||
|
||||
|
||||
SET(vwm_SRCS
|
||||
vwm_api.cpp
|
||||
vwm_api.h
|
||||
@@ -23,16 +31,18 @@ SET(vwm_SRCS
|
||||
)
|
||||
|
||||
NGL_ADD_LIBRARY2(AAR SV BuildingControlVwm SHARED ${vwm_SRCS})
|
||||
NGL_TARGET_LINK_LIBRARIES(BuildingControlVwm
|
||||
PRIVATE
|
||||
ngltools
|
||||
Qt6::Xml
|
||||
PUBLIC
|
||||
Qt6::Core
|
||||
Qt6::Gui
|
||||
LtsUtilsCoreHeaderOnly
|
||||
BuildingControlCommon
|
||||
)
|
||||
if(QT6_GUI_AVAILABLE)
|
||||
NGL_TARGET_LINK_LIBRARIES(BuildingControlVwm
|
||||
PRIVATE
|
||||
ngltools
|
||||
Qt6::Xml
|
||||
PUBLIC
|
||||
Qt6::Core
|
||||
${Qt6_Gui}
|
||||
LtsUtilsCoreHeaderOnly
|
||||
BuildingControlCommon
|
||||
)
|
||||
endif()
|
||||
################################
|
||||
### Test
|
||||
################################
|
||||
@@ -49,15 +59,17 @@ NGL_TARGET_LINK_LIBRARIES(BuildingControlTestVwm
|
||||
LtsCoordTrans
|
||||
)
|
||||
NGL_ADD_EXECUTABLE(AAR SV BuildingControlTestVwmXml test_vwm_xml.cpp)
|
||||
NGL_TARGET_LINK_LIBRARIES(BuildingControlTestVwmXml
|
||||
LtsUtilsCoreHeaderOnly
|
||||
Qt6::Xml
|
||||
Qt6::Core
|
||||
Qt6::Gui
|
||||
BuildingControlVwm
|
||||
BuildingControlCommon
|
||||
nglcoreapplication
|
||||
)
|
||||
if(QT6_GUI_AVAILABLE)
|
||||
NGL_TARGET_LINK_LIBRARIES(BuildingControlTestVwmXml
|
||||
LtsUtilsCoreHeaderOnly
|
||||
Qt6::Xml
|
||||
Qt6::Core
|
||||
${Qt6_Gui}
|
||||
BuildingControlVwm
|
||||
BuildingControlCommon
|
||||
nglcoreapplication
|
||||
)
|
||||
endif()
|
||||
|
||||
IF(BUILD_TESTING AND TARGET BuildingControlVwm)
|
||||
SET(test_SRCS
|
||||
@@ -66,7 +78,7 @@ IF(BUILD_TESTING AND TARGET BuildingControlVwm)
|
||||
)
|
||||
ADD_EXECUTABLE(bld_vwm_math_unit_test ${test_SRCS})
|
||||
TARGET_LINK_LIBRARIES(bld_vwm_math_unit_test
|
||||
Qt6::Gui
|
||||
${Qt6_Gui}
|
||||
Qt6::Core
|
||||
Qt6::Test
|
||||
BuildingControlVwm
|
||||
|
||||
@@ -4,6 +4,21 @@
|
||||
# $Author$
|
||||
#
|
||||
|
||||
# Make ${Qt6_Gui} optional
|
||||
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Gui)
|
||||
set(Qt6_Gui ${Qt6_Gui})
|
||||
else()
|
||||
set(Qt6_Gui "")
|
||||
endif()
|
||||
|
||||
# Make ${Qt6_WebSockets} optional
|
||||
if(QT6_GUI_AVAILABLE AND TARGET Qt6::WebSockets)
|
||||
set(Qt6_WebSockets ${Qt6_WebSockets})
|
||||
else()
|
||||
set(Qt6_WebSockets "")
|
||||
endif()
|
||||
|
||||
|
||||
ADD_SUBDIRECTORY(BuildingControlUnit)
|
||||
|
||||
INCLUDE(MacroRTIDDSGen)
|
||||
@@ -158,29 +173,31 @@ CODEGEN_SQL(SRCS_exe ${xml_FILE})
|
||||
|
||||
NGL_ADD_SVC_ICON(SRCS_exe)
|
||||
NGL_ADD_EXECUTABLE(AAR SV svcBuildings ${SRCS_exe})
|
||||
NGL_TARGET_LINK_LIBRARIES(svcBuildings
|
||||
Qt6::Core
|
||||
Qt6::Gui
|
||||
Qt6::WebSockets
|
||||
BuildingControlCommon
|
||||
svcBldCommon
|
||||
svcAsmClient
|
||||
svcBldServer
|
||||
svcBldClient
|
||||
svcCoreClient
|
||||
svcPdmClient
|
||||
svcPpmClient
|
||||
svcIsmClient
|
||||
ddsconnector
|
||||
nglsettings
|
||||
ProjectConfig
|
||||
LtsCommandLineParser
|
||||
LtsCoordTrans
|
||||
NGLLogger
|
||||
nglcoreapplication
|
||||
ngltools
|
||||
LtsUtilsCore
|
||||
)
|
||||
if(QT6_GUI_AVAILABLE)
|
||||
NGL_TARGET_LINK_LIBRARIES(svcBuildings
|
||||
Qt6::Core
|
||||
${Qt6_Gui}
|
||||
${Qt6_WebSockets}
|
||||
BuildingControlCommon
|
||||
svcBldCommon
|
||||
svcAsmClient
|
||||
svcBldServer
|
||||
svcBldClient
|
||||
svcCoreClient
|
||||
svcPdmClient
|
||||
svcPpmClient
|
||||
svcIsmClient
|
||||
ddsconnector
|
||||
nglsettings
|
||||
ProjectConfig
|
||||
LtsCommandLineParser
|
||||
LtsCoordTrans
|
||||
NGLLogger
|
||||
nglcoreapplication
|
||||
ngltools
|
||||
LtsUtilsCore
|
||||
)
|
||||
endif()
|
||||
NGL_INSTALL_TARGET(svcBuildings)
|
||||
NGL_INSTALL(AAR SV FILES log4cxx_bld.props DESTINATION bin)
|
||||
NGL_ADD_TARGET_LINK(svcBuildings sBLD)
|
||||
|
||||
@@ -7,6 +7,14 @@
|
||||
#
|
||||
# --- Library svcCnrHelper --------------------------------------------------------------------------------
|
||||
#
|
||||
# Make ${Qt6_WebSockets} optional
|
||||
if(QT6_GUI_AVAILABLE AND TARGET Qt6::WebSockets)
|
||||
set(Qt6_WebSockets ${Qt6_WebSockets})
|
||||
else()
|
||||
set(Qt6_WebSockets "")
|
||||
endif()
|
||||
|
||||
|
||||
SET(SRCS_helper
|
||||
Helper/cnr_frequency_planning_helper.cpp
|
||||
Helper/cnr_frequency_planning_helper.h
|
||||
@@ -99,7 +107,7 @@ NGL_TARGET_LINK_LIBRARIES(svcCombatNetRadio
|
||||
NGLLogger
|
||||
Qt6::Core
|
||||
Qt6::Network
|
||||
Qt6::WebSockets
|
||||
${Qt6_WebSockets}
|
||||
ngltools
|
||||
svcCoreClient
|
||||
svcCnrHelper
|
||||
|
||||
@@ -4,6 +4,14 @@
|
||||
# $Author$
|
||||
#
|
||||
|
||||
# Make ${Qt6_WebSockets} optional
|
||||
if(QT6_GUI_AVAILABLE AND TARGET Qt6::WebSockets)
|
||||
set(Qt6_WebSockets ${Qt6_WebSockets})
|
||||
else()
|
||||
set(Qt6_WebSockets "")
|
||||
endif()
|
||||
|
||||
|
||||
SET(xml_FILE gna_service.xml)
|
||||
|
||||
#
|
||||
@@ -119,7 +127,7 @@ NGL_TARGET_LINK_LIBRARIES(svcGnaServer
|
||||
ddsfts
|
||||
Qt6::Core
|
||||
Qt6::Network
|
||||
Qt6::WebSockets
|
||||
${Qt6_WebSockets}
|
||||
LtsCoordTrans
|
||||
NGLLogger
|
||||
nglsettings
|
||||
|
||||
+9
-1
@@ -6,6 +6,14 @@
|
||||
#
|
||||
# --- Executable svcHighLevelArchitecture (svcHLA) -------------------------------------------------
|
||||
#
|
||||
# Make ${Qt6_WebSockets} optional
|
||||
if(QT6_GUI_AVAILABLE AND TARGET Qt6::WebSockets)
|
||||
set(Qt6_WebSockets ${Qt6_WebSockets})
|
||||
else()
|
||||
set(Qt6_WebSockets "")
|
||||
endif()
|
||||
|
||||
|
||||
SET(xml_FILE hla_service.xml)
|
||||
|
||||
SET(SRCS_exe
|
||||
@@ -100,7 +108,7 @@ NGL_TARGET_LINK_LIBRARIES(svcHighLevelArchitecture
|
||||
nglsettings
|
||||
Qt6::Core
|
||||
Qt6::Network
|
||||
Qt6::WebSockets
|
||||
${Qt6_WebSockets}
|
||||
svcAesClient
|
||||
svcCoreClient
|
||||
svcExmClient
|
||||
|
||||
+9
-1
@@ -7,6 +7,14 @@
|
||||
# --- Executable svcHighLevelArchitecture (svcHLA) -------------------------------------------------
|
||||
#
|
||||
|
||||
# Make ${Qt6_WebSockets} optional
|
||||
if(QT6_GUI_AVAILABLE AND TARGET Qt6::WebSockets)
|
||||
set(Qt6_WebSockets ${Qt6_WebSockets})
|
||||
else()
|
||||
set(Qt6_WebSockets "")
|
||||
endif()
|
||||
|
||||
|
||||
SET(xml_FILE hla_service.xml)
|
||||
|
||||
SET(SRCS_exe
|
||||
@@ -145,7 +153,7 @@ NGL_TARGET_LINK_LIBRARIES(svcHighLevelArchitecture
|
||||
nglsettings
|
||||
Qt6::Core
|
||||
Qt6::Network
|
||||
Qt6::WebSockets
|
||||
${Qt6_WebSockets}
|
||||
svcAesClient
|
||||
svcCoreClient
|
||||
svcExmClient
|
||||
|
||||
+34
-17
@@ -7,6 +7,21 @@
|
||||
# --- Executable hlaTestTool -------------------------------------------------
|
||||
#
|
||||
|
||||
# Make ${Qt6_Gui} optional
|
||||
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Gui)
|
||||
set(Qt6_Gui ${Qt6_Gui})
|
||||
else()
|
||||
set(Qt6_Gui "")
|
||||
endif()
|
||||
|
||||
# Make ${Qt6_WebSockets} optional
|
||||
if(QT6_GUI_AVAILABLE AND TARGET Qt6::WebSockets)
|
||||
set(Qt6_WebSockets ${Qt6_WebSockets})
|
||||
else()
|
||||
set(Qt6_WebSockets "")
|
||||
endif()
|
||||
|
||||
|
||||
SET(SRCS_exe
|
||||
main.cpp
|
||||
main_handler.cpp
|
||||
@@ -94,23 +109,25 @@ SET_SOURCE_FILES_PROPERTIES(ngs_connector.cpp PROPERTIES SKIP_UNITY_BUILD_INCLUS
|
||||
|
||||
#NGL_ADD_SVC_ICON(SRCS_exe)
|
||||
NGL_ADD_EXECUTABLE(HLA hlaTestTool ${SRCS_exe})
|
||||
NGL_TARGET_LINK_LIBRARIES(hlaTestTool
|
||||
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
|
||||
LtsCommandLineParser
|
||||
LtsCoordTrans
|
||||
nglcoreapplication
|
||||
NGLLogger
|
||||
nglsettings
|
||||
Qt6::Core
|
||||
Qt6::Gui
|
||||
Qt6::Network
|
||||
Qt6::WebSockets
|
||||
ngltools
|
||||
# LtsUtilsDds
|
||||
NGS::NGS
|
||||
HlaCommon
|
||||
tabTelegrams
|
||||
)
|
||||
if(QT6_GUI_AVAILABLE)
|
||||
NGL_TARGET_LINK_LIBRARIES(hlaTestTool
|
||||
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
|
||||
LtsCommandLineParser
|
||||
LtsCoordTrans
|
||||
nglcoreapplication
|
||||
NGLLogger
|
||||
nglsettings
|
||||
Qt6::Core
|
||||
${Qt6_Gui}
|
||||
Qt6::Network
|
||||
${Qt6_WebSockets}
|
||||
ngltools
|
||||
# LtsUtilsDds
|
||||
NGS::NGS
|
||||
HlaCommon
|
||||
tabTelegrams
|
||||
)
|
||||
endif()
|
||||
|
||||
NGL_INSTALL_TARGET(hlaTestTool)
|
||||
|
||||
|
||||
@@ -8,6 +8,14 @@
|
||||
#ADD_SUBDIRECTORY(UnitTests)
|
||||
#ADD_SUBDIRECTORY(ModuleTests)
|
||||
|
||||
# Make ${Qt6_Gui} optional
|
||||
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Gui)
|
||||
set(Qt6_Gui ${Qt6_Gui})
|
||||
else()
|
||||
set(Qt6_Gui "")
|
||||
endif()
|
||||
|
||||
|
||||
INCLUDE(MacroRTIDDSGen)
|
||||
INCLUDE(MacroCodeGenIdl)
|
||||
|
||||
@@ -43,7 +51,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(tabTelegrams
|
||||
NGL_TARGET_LINK_LIBRARIES(tabTelegrams
|
||||
PUBLIC
|
||||
${_QT_CORE_TARGET}
|
||||
Qt6::Gui
|
||||
$<IF:$<AND:$<BOOL:${QT6_GUI_AVAILABLE}>,$<TARGET_EXISTS:Qt6::Gui>>,Qt6::Gui,>
|
||||
${_QT_NETWORK_TARGET}
|
||||
)
|
||||
|
||||
@@ -112,7 +120,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcTabCommon
|
||||
NGL_TARGET_LINK_LIBRARIES(svcTabCommon
|
||||
PUBLIC
|
||||
Qt6::Core
|
||||
Qt6::Gui
|
||||
$<IF:$<AND:$<BOOL:${QT6_GUI_AVAILABLE}>,$<TARGET_EXISTS:Qt6::Gui>>,Qt6::Gui,>
|
||||
Qt6::Sql
|
||||
Qt6::Network
|
||||
NGLLogger
|
||||
@@ -189,7 +197,7 @@ NGL_TARGET_LINK_LIBRARIES(svcTabServer
|
||||
svcTabCommon
|
||||
ngldb
|
||||
${_QT_CORE_TARGET}
|
||||
Qt6::Gui
|
||||
$<IF:$<AND:$<BOOL:${QT6_GUI_AVAILABLE}>,$<TARGET_EXISTS:Qt6::Gui>>,Qt6::Gui,>
|
||||
${_QT_NETWORK_TARGET}
|
||||
)
|
||||
IF(BUILD_RTI)
|
||||
|
||||
+10
-2
@@ -7,6 +7,14 @@
|
||||
# Created by Julius Ewert, ESIM, 2024-03-20
|
||||
#
|
||||
|
||||
# Make ${Qt6_WebSockets} optional
|
||||
if(QT6_GUI_AVAILABLE AND TARGET Qt6::WebSockets)
|
||||
set(Qt6_WebSockets ${Qt6_WebSockets})
|
||||
else()
|
||||
set(Qt6_WebSockets "")
|
||||
endif()
|
||||
|
||||
|
||||
SET(SRCS_SAA
|
||||
telegrams.h
|
||||
telegrams.cpp
|
||||
@@ -26,7 +34,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(saaTelegrams
|
||||
NGL_TARGET_LINK_LIBRARIES(saaTelegrams
|
||||
# svcPdmClient # Externe Dependency - nicht verfügbar
|
||||
Qt6::Core
|
||||
Qt6::WebSockets
|
||||
${Qt6_WebSockets}
|
||||
)
|
||||
|
||||
SET(SRCS
|
||||
@@ -74,7 +82,7 @@ NGL_TARGET_LINK_LIBRARIES(tabPluginAdler
|
||||
ngltools
|
||||
Qt6::Core
|
||||
Qt6::Network
|
||||
Qt6::WebSockets
|
||||
${Qt6_WebSockets}
|
||||
tabPluginInterface
|
||||
OpmDataPluginInterface
|
||||
tabTelegrams
|
||||
|
||||
+9
-1
@@ -5,6 +5,14 @@
|
||||
# $Author: fritsche_h $
|
||||
#
|
||||
|
||||
# Make ${Qt6_WebSockets} optional
|
||||
if(QT6_GUI_AVAILABLE AND TARGET Qt6::WebSockets)
|
||||
set(Qt6_WebSockets ${Qt6_WebSockets})
|
||||
else()
|
||||
set(Qt6_WebSockets "")
|
||||
endif()
|
||||
|
||||
|
||||
SET(UnitTestSources
|
||||
test_telegram_decoding.cpp
|
||||
ex_anmeldung.cpp
|
||||
@@ -69,7 +77,7 @@ ADD_EXECUTABLE(tabModuleTestAdler ${LinkedSources} ${UnitTestSources}
|
||||
nglapplication
|
||||
saaTelegrams
|
||||
Qt6::Network
|
||||
Qt6::WebSockets
|
||||
${Qt6_WebSockets}
|
||||
Qt6::Test
|
||||
)
|
||||
|
||||
|
||||
+9
-1
@@ -5,6 +5,14 @@
|
||||
# $Author$
|
||||
#
|
||||
|
||||
# Make ${Qt6_WebSockets} optional
|
||||
if(QT6_GUI_AVAILABLE AND TARGET Qt6::WebSockets)
|
||||
set(Qt6_WebSockets ${Qt6_WebSockets})
|
||||
else()
|
||||
set(Qt6_WebSockets "")
|
||||
endif()
|
||||
|
||||
|
||||
SET(SRCS
|
||||
logger.cpp
|
||||
logger.h
|
||||
@@ -39,7 +47,7 @@ NGL_TARGET_LINK_LIBRARIES(tabPluginApHla
|
||||
ngltools
|
||||
Qt6::Core
|
||||
Qt6::Network
|
||||
Qt6::WebSockets
|
||||
${Qt6_WebSockets}
|
||||
tabPluginInterface
|
||||
tabTelegrams
|
||||
svcTabCommon
|
||||
|
||||
+9
-1
@@ -5,6 +5,14 @@
|
||||
# $Author$
|
||||
#
|
||||
|
||||
# Make ${Qt6_WebSockets} optional
|
||||
if(QT6_GUI_AVAILABLE AND TARGET Qt6::WebSockets)
|
||||
set(Qt6_WebSockets ${Qt6_WebSockets})
|
||||
else()
|
||||
set(Qt6_WebSockets "")
|
||||
endif()
|
||||
|
||||
|
||||
ADD_SUBDIRECTORY(XDR_QtHandler)
|
||||
|
||||
SET(SRCS
|
||||
@@ -27,7 +35,7 @@ NGL_TARGET_LINK_LIBRARIES(tabPluginDebugJsonDir
|
||||
NGLLogger
|
||||
nglsettings
|
||||
Qt6::Core
|
||||
Qt6::WebSockets
|
||||
${Qt6_WebSockets}
|
||||
tabPluginInterface
|
||||
xdr_qthandler_dir
|
||||
)
|
||||
+9
-1
@@ -5,6 +5,14 @@
|
||||
# $Author$
|
||||
#
|
||||
|
||||
# Make ${Qt6_WebSockets} optional
|
||||
if(QT6_GUI_AVAILABLE AND TARGET Qt6::WebSockets)
|
||||
set(Qt6_WebSockets ${Qt6_WebSockets})
|
||||
else()
|
||||
set(Qt6_WebSockets "")
|
||||
endif()
|
||||
|
||||
|
||||
SET(SRCS
|
||||
logger.cpp
|
||||
logger.h
|
||||
@@ -29,7 +37,7 @@ NGL_TARGET_LINK_LIBRARIES(tabPluginHla
|
||||
nglsettings
|
||||
Qt6::Core
|
||||
Qt6::Network
|
||||
Qt6::WebSockets
|
||||
${Qt6_WebSockets}
|
||||
tabPluginInterface
|
||||
tabTelegrams
|
||||
)
|
||||
+9
-1
@@ -5,6 +5,14 @@
|
||||
# $Author$
|
||||
#
|
||||
|
||||
# Make ${Qt6_WebSockets} optional
|
||||
if(QT6_GUI_AVAILABLE AND TARGET Qt6::WebSockets)
|
||||
set(Qt6_WebSockets ${Qt6_WebSockets})
|
||||
else()
|
||||
set(Qt6_WebSockets "")
|
||||
endif()
|
||||
|
||||
|
||||
SET(SRCS
|
||||
logger.cpp
|
||||
logger.h
|
||||
@@ -33,7 +41,7 @@ NGL_TARGET_LINK_LIBRARIES(tabPluginNmea
|
||||
Qt6::Core
|
||||
Qt6::Network
|
||||
Qt6::Sql
|
||||
Qt6::WebSockets
|
||||
${Qt6_WebSockets}
|
||||
tabPluginInterface
|
||||
tabTelegrams
|
||||
)
|
||||
+9
-1
@@ -5,6 +5,14 @@
|
||||
# $Author$
|
||||
#
|
||||
|
||||
# Make ${Qt6_WebSockets} optional
|
||||
if(QT6_GUI_AVAILABLE AND TARGET Qt6::WebSockets)
|
||||
set(Qt6_WebSockets ${Qt6_WebSockets})
|
||||
else()
|
||||
set(Qt6_WebSockets "")
|
||||
endif()
|
||||
|
||||
|
||||
SET(SRCS
|
||||
convert_from_json.cpp
|
||||
convert_from_json.h
|
||||
@@ -29,7 +37,7 @@ NGL_TARGET_LINK_LIBRARIES(tabPluginTetraJson
|
||||
Qt6::Core
|
||||
Qt6::Network
|
||||
Qt6::Sql
|
||||
Qt6::WebSockets
|
||||
${Qt6_WebSockets}
|
||||
tabPluginInterface
|
||||
tabTelegrams
|
||||
PrtCnvLib
|
||||
|
||||
+28
-18
@@ -1,3 +1,11 @@
|
||||
# Make ${Qt6_Gui} optional
|
||||
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Gui)
|
||||
set(Qt6_Gui ${Qt6_Gui})
|
||||
else()
|
||||
set(Qt6_Gui "")
|
||||
endif()
|
||||
|
||||
|
||||
add_subdirectory(TmsIfAdapter)
|
||||
|
||||
|
||||
@@ -24,23 +32,25 @@ set(src
|
||||
|
||||
NGL_ADD_LIBRARY(SV tabPluginUAS MODULE ${src})
|
||||
|
||||
NGL_TARGET_LINK_LIBRARIES(tabPluginUAS
|
||||
TmsIfAdapterInterface
|
||||
|
||||
NGLLogger
|
||||
nglsettings
|
||||
Qt6::Core
|
||||
Qt6::Gui
|
||||
Qt6::Network
|
||||
tabTelegrams
|
||||
tabPluginInterface
|
||||
svcCesClient
|
||||
svcPdmClient
|
||||
svcTabCommon
|
||||
svcPpmClient
|
||||
svcFlmClient
|
||||
LtsUtilsCoreHeaderOnly
|
||||
LtsCoordTrans # geocentric2LonLatAlt
|
||||
)
|
||||
if(QT6_GUI_AVAILABLE)
|
||||
NGL_TARGET_LINK_LIBRARIES(tabPluginUAS
|
||||
TmsIfAdapterInterface
|
||||
|
||||
NGLLogger
|
||||
nglsettings
|
||||
Qt6::Core
|
||||
${Qt6_Gui}
|
||||
Qt6::Network
|
||||
tabTelegrams
|
||||
tabPluginInterface
|
||||
svcCesClient
|
||||
svcPdmClient
|
||||
svcTabCommon
|
||||
svcPpmClient
|
||||
svcFlmClient
|
||||
LtsUtilsCoreHeaderOnly
|
||||
LtsCoordTrans # geocentric2LonLatAlt
|
||||
)
|
||||
endif()
|
||||
|
||||
NGL_INSTALL_TARGET(tabPluginUAS)
|
||||
+18
-8
@@ -1,3 +1,11 @@
|
||||
# Make ${Qt6_Widgets} optional
|
||||
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
|
||||
set(Qt6_Widgets ${Qt6_Widgets})
|
||||
else()
|
||||
set(Qt6_Widgets "")
|
||||
endif()
|
||||
|
||||
|
||||
MACRO(_BUILD_TEST test_id)
|
||||
add_executable(TabUASTest${test_id} test${test_id}.cpp)
|
||||
FIND_PACKAGE(TMSIF REQUIRED)
|
||||
@@ -64,11 +72,13 @@ PRIVATE
|
||||
|
||||
# test6
|
||||
add_executable(TabUASTest6 test6.cpp)
|
||||
target_link_libraries(TabUASTest6
|
||||
PRIVATE
|
||||
Qt6::Core
|
||||
Qt6::Widgets
|
||||
|
||||
#TmsIfAdapter via dlopen !
|
||||
TmsIfAdapterInterface
|
||||
)
|
||||
if(QT6_GUI_AVAILABLE)
|
||||
target_link_libraries(TabUASTest6
|
||||
PRIVATE
|
||||
Qt6::Core
|
||||
${Qt6_Widgets}
|
||||
|
||||
#TmsIfAdapter via dlopen !
|
||||
TmsIfAdapterInterface
|
||||
)
|
||||
endif()
|
||||
+32
-15
@@ -5,6 +5,21 @@
|
||||
# $Author$
|
||||
#
|
||||
|
||||
# Make ${Qt6_Gui} optional
|
||||
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Gui)
|
||||
set(Qt6_Gui ${Qt6_Gui})
|
||||
else()
|
||||
set(Qt6_Gui "")
|
||||
endif()
|
||||
|
||||
# Make ${Qt6_WebSockets} optional
|
||||
if(QT6_GUI_AVAILABLE AND TARGET Qt6::WebSockets)
|
||||
set(Qt6_WebSockets ${Qt6_WebSockets})
|
||||
else()
|
||||
set(Qt6_WebSockets "")
|
||||
endif()
|
||||
|
||||
|
||||
FIND_PACKAGE(TMSIF REQUIRED)
|
||||
|
||||
if(WIN32)
|
||||
@@ -45,21 +60,23 @@ NGL_TARGET_INCLUDE_DIRECTORIES(TmsIfAdapter
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../../
|
||||
)
|
||||
|
||||
NGL_TARGET_LINK_LIBRARIES(TmsIfAdapter
|
||||
PRIVATE
|
||||
TMSIF::tmsif-cyclone
|
||||
TMSIF::ddscxx
|
||||
TMSIF::ddkit-cyclone
|
||||
|
||||
LtsUtilsCoreHeaderOnly
|
||||
LtsCoordTrans
|
||||
NGLLogger
|
||||
|
||||
Qt6::Core
|
||||
Qt6::Gui
|
||||
Qt6::Network
|
||||
Qt6::WebSockets
|
||||
)
|
||||
if(QT6_GUI_AVAILABLE)
|
||||
NGL_TARGET_LINK_LIBRARIES(TmsIfAdapter
|
||||
PRIVATE
|
||||
TMSIF::tmsif-cyclone
|
||||
TMSIF::ddscxx
|
||||
TMSIF::ddkit-cyclone
|
||||
|
||||
LtsUtilsCoreHeaderOnly
|
||||
LtsCoordTrans
|
||||
NGLLogger
|
||||
|
||||
Qt6::Core
|
||||
${Qt6_Gui}
|
||||
Qt6::Network
|
||||
${Qt6_WebSockets}
|
||||
)
|
||||
endif()
|
||||
|
||||
target_compile_definitions(TmsIfAdapter PUBLIC DDS_VENDOR_CYCLONE)
|
||||
|
||||
|
||||
+9
-1
@@ -5,6 +5,14 @@
|
||||
# $Author$
|
||||
#
|
||||
|
||||
# Make ${Qt6_WebSockets} optional
|
||||
if(QT6_GUI_AVAILABLE AND TARGET Qt6::WebSockets)
|
||||
set(Qt6_WebSockets ${Qt6_WebSockets})
|
||||
else()
|
||||
set(Qt6_WebSockets "")
|
||||
endif()
|
||||
|
||||
|
||||
SET(SRCS
|
||||
logger.cpp
|
||||
logger.h
|
||||
@@ -42,7 +50,7 @@ NGL_TARGET_LINK_LIBRARIES(tabPluginWlsTetra
|
||||
Qt6::Core
|
||||
Qt6::Network
|
||||
Qt6::Sql
|
||||
Qt6::WebSockets
|
||||
${Qt6_WebSockets}
|
||||
tabPluginInterface
|
||||
tabTelegrams
|
||||
)
|
||||
@@ -8,6 +8,14 @@
|
||||
#ADD_SUBDIRECTORY(UnitTests)
|
||||
#ADD_SUBDIRECTORY(ModuleTests)
|
||||
|
||||
# Make ${Qt6_WebSockets} optional
|
||||
if(QT6_GUI_AVAILABLE AND TARGET Qt6::WebSockets)
|
||||
set(Qt6_WebSockets ${Qt6_WebSockets})
|
||||
else()
|
||||
set(Qt6_WebSockets "")
|
||||
endif()
|
||||
|
||||
|
||||
INCLUDE(MacroRTIDDSGen)
|
||||
INCLUDE(MacroCodeGenIdl)
|
||||
|
||||
@@ -172,7 +180,7 @@ NGL_TARGET_LINK_LIBRARIES(svcTrainingAreaBaseOC
|
||||
Qt6::Core
|
||||
Qt6::Network
|
||||
Qt6::SerialPort
|
||||
Qt6::WebSockets
|
||||
${Qt6_WebSockets}
|
||||
LtsCoordTrans
|
||||
LtsSerialPortQuerry
|
||||
LtsCommandLineParser
|
||||
|
||||
@@ -8,6 +8,14 @@
|
||||
#ADD_SUBDIRECTORY(UnitTests)
|
||||
#ADD_SUBDIRECTORY(ModuleTests)
|
||||
|
||||
# Make ${Qt6_WebSockets} optional
|
||||
if(QT6_GUI_AVAILABLE AND TARGET Qt6::WebSockets)
|
||||
set(Qt6_WebSockets ${Qt6_WebSockets})
|
||||
else()
|
||||
set(Qt6_WebSockets "")
|
||||
endif()
|
||||
|
||||
|
||||
SET(xml_FILE wms_service.xml)
|
||||
|
||||
# --- Executable proxyWarehouseManagement (pWMS) -------------------------------------------------
|
||||
@@ -58,7 +66,7 @@ NGL_TARGET_LINK_LIBRARIES(svcWarehouseManagement
|
||||
nglcoreapplication
|
||||
nglsettings
|
||||
ngltools
|
||||
Qt6::WebSockets
|
||||
${Qt6_WebSockets}
|
||||
wms_json_ds
|
||||
)
|
||||
target_include_directories(svcWarehouseManagement PRIVATE
|
||||
|
||||
@@ -6,6 +6,14 @@
|
||||
#
|
||||
# --- Executable svcWirelessLocationSystem (svcWLS) -------------------------------------------------
|
||||
#
|
||||
# Make ${Qt6_WebSockets} optional
|
||||
if(QT6_GUI_AVAILABLE AND TARGET Qt6::WebSockets)
|
||||
set(Qt6_WebSockets ${Qt6_WebSockets})
|
||||
else()
|
||||
set(Qt6_WebSockets "")
|
||||
endif()
|
||||
|
||||
|
||||
SET(xml_FILE wls_service.xml)
|
||||
|
||||
SET(SRCS_exe
|
||||
@@ -41,7 +49,7 @@ NGL_ADD_EXECUTABLE(AAR SV svcWirelessLocationSystem ${SRCS_exe})
|
||||
NGL_TARGET_LINK_LIBRARIES(svcWirelessLocationSystem
|
||||
Qt6::Core
|
||||
Qt6::Network
|
||||
Qt6::WebSockets
|
||||
${Qt6_WebSockets}
|
||||
svcCoreClient
|
||||
$<IF:$<TARGET_EXISTS:svcIsmClient>,svcIsmClient,>
|
||||
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
|
||||
@@ -62,7 +70,7 @@ NGL_ADD_TARGET_LINK(svcWirelessLocationSystem pWLS)
|
||||
NGL_ADD_EXECUTABLE(AAR SV wlsJsonClientTest wls_json_client_test.cpp wls_json_client_test.h)
|
||||
NGL_TARGET_LINK_LIBRARIES(wlsJsonClientTest
|
||||
Qt6::Core
|
||||
Qt6::WebSockets
|
||||
${Qt6_WebSockets}
|
||||
)
|
||||
|
||||
NGL_ADD_LIBRARY2(SfmConverter AAR SV SHARED
|
||||
|
||||
Reference in new issue
Block a user