Adds succesfull lts/proxies migration & testsuite
This commit is contained in:
59 files changed
+754
-273
No files matched your search
@@ -26,18 +26,10 @@ SET(xml_FILE tab_service.xml)
|
||||
#
|
||||
# --- Library tabTelegrams --------------------------------------------------------------------------------
|
||||
#
|
||||
# Prefer Qt6 when available, fall back to Qt5
|
||||
find_package(Qt6 COMPONENTS Core Sql Network QUIET)
|
||||
if (Qt6_FOUND)
|
||||
set(_QT_CORE_TARGET Qt6::Core)
|
||||
set(_QT_SQL_TARGET Qt6::Sql)
|
||||
set(_QT_NETWORK_TARGET Qt6::Network)
|
||||
else()
|
||||
find_package(Qt6 COMPONENTS Core Sql Network QUIET)
|
||||
set(_QT_CORE_TARGET Qt6::Core)
|
||||
set(_QT_SQL_TARGET Qt6::Sql)
|
||||
set(_QT_NETWORK_TARGET Qt6::Network)
|
||||
endif()
|
||||
find_package(Qt6 COMPONENTS Core Sql Network REQUIRED)
|
||||
set(_QT_CORE_TARGET Qt6::Core)
|
||||
set(_QT_SQL_TARGET Qt6::Sql)
|
||||
set(_QT_NETWORK_TARGET Qt6::Network)
|
||||
|
||||
SET(SRCS_telegrams
|
||||
training_area_telegrams.cpp
|
||||
|
||||
+1
-1
@@ -26,7 +26,7 @@ SET(SRCS
|
||||
PrtCnv.dat
|
||||
)
|
||||
|
||||
QT5_ADD_RESOURCES(SRCS tetra.qrc)
|
||||
qt6_add_resources(SRCS tetra.qrc)
|
||||
|
||||
NGL_ADD_LIBRARY(AAR SV tabPluginTetraJson MODULE ${SRCS})
|
||||
NGL_INSTALL_TARGET(tabPluginTetraJson)
|
||||
|
||||
+3
@@ -26,6 +26,7 @@ ENDMACRO()
|
||||
#_BUILD_TEST(1)
|
||||
#_BUILD_TEST(2)
|
||||
_BUILD_TEST(3)
|
||||
add_test(NAME tab_uas_test3 COMMAND $<TARGET_FILE:TabUASTest3>)
|
||||
|
||||
|
||||
# # test4
|
||||
@@ -59,6 +60,7 @@ PRIVATE
|
||||
TmsIfAdapterInterface
|
||||
tabPluginInterface
|
||||
)
|
||||
add_test(NAME tab_uas_test4_2 COMMAND $<TARGET_FILE:TabUASTest4_2>)
|
||||
|
||||
|
||||
# # test5
|
||||
@@ -81,4 +83,5 @@ if(QT6_GUI_AVAILABLE)
|
||||
#TmsIfAdapter via dlopen !
|
||||
TmsIfAdapterInterface
|
||||
)
|
||||
add_test(NAME tab_uas_test6 COMMAND $<TARGET_FILE:TabUASTest6>)
|
||||
endif()
|
||||
+1
-1
@@ -39,7 +39,7 @@ SET(SRCS
|
||||
wls_handler_tx.cpp
|
||||
wls_handler_tx.h
|
||||
)
|
||||
QT5_ADD_RESOURCES(SRCS tetra.qrc)
|
||||
qt6_add_resources(SRCS tetra.qrc)
|
||||
NGL_ADD_LIBRARY(AAR SV tabPluginWlsTetra MODULE ${SRCS})
|
||||
NGL_INSTALL_TARGET(tabPluginWlsTetra)
|
||||
NGL_TARGET_LINK_LIBRARIES(tabPluginWlsTetra
|
||||
|
||||
Reference in new issue
Block a user