Replace Qt5:: with Qt6:: in 26 CMakeLists.txt files
Qt6 migration: Update all target_link_libraries to use Qt6::Core, Qt6::Widgets, Qt6::Network, Qt6::Svg, Qt6::Xml, Qt6::Concurrent, Qt6::PrintSupport, Qt6::Sql, Qt6::Test, Qt6::WebSockets, Qt6::SerialPort instead of Qt5:: equivalents. Affected components: - Lts/Common: LtsRestClient, LtsWidgets - Lts/Application: THP, SitMapReplayTest - Lts/Plugins: ParticipantManagement, ServiceManagement - Lts/Services: VideoOverlayManagement - Lts/Tools: 18 tool CMakeLists.txt files Validated with BUILD_RTI=ON and BUILD_RTI=OFF - both builds successful. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
26 files changed
+57
-57
No files matched your search
@@ -75,14 +75,14 @@ NGL_TARGET_LINK_LIBRARIES(thp_viewer
|
||||
ArcGISQt5Hack # make sure it's loaded *before* libEsriCommonQt.so
|
||||
|
||||
${VLC_LIBRARIES}
|
||||
Qt5::Core
|
||||
Qt5::Gui
|
||||
Qt5::PrintSupport
|
||||
Qt5::Svg
|
||||
Qt5::WebEngineCore
|
||||
Qt5::WebEngineWidgets
|
||||
Qt5::Widgets
|
||||
Qt5::Xml
|
||||
Qt6::Core
|
||||
Qt6::Gui
|
||||
Qt6::PrintSupport
|
||||
Qt6::Svg
|
||||
Qt6::WebEngineCore
|
||||
Qt6::WebEngineWidgets
|
||||
Qt6::Widgets
|
||||
Qt6::Xml
|
||||
|
||||
RmeLightStyleQrc
|
||||
|
||||
|
||||
@@ -18,7 +18,7 @@ NGL_TARGET_LINK_LIBRARIES(SitMapReplayTest
|
||||
SituationReplaySqlite
|
||||
|
||||
ddsconnector
|
||||
Qt5::Core
|
||||
Qt6::Core
|
||||
nglapplication
|
||||
SitmapDds
|
||||
|
||||
|
||||
@@ -22,6 +22,6 @@ NGL_TARGET_INCLUDE_DIRECTORIES(LtsRestClient
|
||||
|
||||
NGL_TARGET_LINK_LIBRARIES(LtsRestClient
|
||||
PUBLIC
|
||||
Qt5::Core
|
||||
Qt5::Network
|
||||
Qt6::Core
|
||||
Qt6::Network
|
||||
)
|
||||
@@ -158,8 +158,8 @@ NGL_TARGET_INCLUDE_DIRECTORIES(LtsWidgets
|
||||
|
||||
NGL_TARGET_LINK_LIBRARIES(LtsWidgets
|
||||
PRIVATE
|
||||
Qt5::Network # for QHostInfo - for portability
|
||||
Qt5::Svg
|
||||
Qt6::Network # for QHostInfo - for portability
|
||||
Qt6::Svg
|
||||
ngltools
|
||||
ngltranslator
|
||||
TabBarTabStyle
|
||||
@@ -167,9 +167,9 @@ NGL_TARGET_LINK_LIBRARIES(LtsWidgets
|
||||
LtsUtilsSettings
|
||||
PUBLIC
|
||||
LtsUtilsCore
|
||||
Qt5::Core
|
||||
Qt5::Widgets
|
||||
Qt5::Gui
|
||||
Qt6::Core
|
||||
Qt6::Widgets
|
||||
Qt6::Gui
|
||||
)
|
||||
|
||||
NGL_INSTALL_TARGET(LtsWidgets)
|
||||
|
||||
@@ -107,5 +107,5 @@ ADD_INTERFACE_LIBRARY(
|
||||
GuiElementInterface
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/participant_info_gui_element_interface.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/..
|
||||
Qt5::Core LtsWidgets
|
||||
Qt6::Core LtsWidgets
|
||||
)
|
||||
+1
-1
@@ -88,7 +88,7 @@ NGL_TARGET_LINK_LIBRARIES(PpmParticipantInfoGuiPlugin
|
||||
PdmDataPluginInterface
|
||||
svcTgtClient
|
||||
PdmGuiPluginInterface
|
||||
Qt5::Widgets
|
||||
Qt6::Widgets
|
||||
LtsWidgets
|
||||
LtsSession
|
||||
LtsSessionData
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
#
|
||||
NGL_ADD_LIBRARY(WS ScmDataPlugin MODULE scm_data_plugin.cpp scm_data_plugin.h)
|
||||
NGL_TARGET_LINK_LIBRARIES(ScmDataPlugin
|
||||
Qt5::Core
|
||||
Qt6::Core
|
||||
ScmDataPluginInterface
|
||||
svcScmClient
|
||||
NGLLogger
|
||||
|
||||
+1
-1
@@ -28,7 +28,7 @@ NGL_TARGET_LINK_LIBRARIES(ScmEditGuiPlugin
|
||||
ScmGuiPluginInterface
|
||||
ScmDataPluginInterface
|
||||
LtsSession
|
||||
Qt5::Widgets
|
||||
Qt6::Widgets
|
||||
LtsWidgets
|
||||
LtsUtilsGuiDds
|
||||
svcScmCommon
|
||||
|
||||
@@ -34,8 +34,8 @@ CODEGEN_HANDLE_SVC_XML(SRCS_exe ${xml_FILE})
|
||||
NGL_ADD_SVC_ICON(SRCS_exe)
|
||||
NGL_ADD_EXECUTABLE(AAR SV svcVideoOverlayManagement ${SRCS_exe})
|
||||
NGL_TARGET_LINK_LIBRARIES(svcVideoOverlayManagement
|
||||
Qt5::Core
|
||||
Qt5::Network
|
||||
Qt6::Core
|
||||
Qt6::Network
|
||||
ddsconnector
|
||||
ddsQoS
|
||||
svcCoreClient
|
||||
|
||||
@@ -19,9 +19,9 @@ NGL_WRAP_UI(SRCS ui/mainwindow.ui)
|
||||
NGL_ADD_EXECUTABLE(WS NO_TRANSLATION CnrProxyTester ${SRCS})
|
||||
|
||||
NGL_TARGET_LINK_LIBRARIES(CnrProxyTester
|
||||
Qt5::Widgets
|
||||
Qt5::Core
|
||||
Qt5::WebSockets
|
||||
Qt6::Widgets
|
||||
Qt6::Core
|
||||
Qt6::WebSockets
|
||||
nglapplication
|
||||
LtsDataView
|
||||
LtsWidgets
|
||||
|
||||
@@ -27,7 +27,7 @@ IF(NOT WIN32)
|
||||
NGL_ADD_EXECUTABLE(WS ConfigX NO_TRANSLATION ${ConfigX_SRCS} ${ConfigX_UICS})
|
||||
|
||||
NGL_TARGET_LINK_LIBRARIES(ConfigX
|
||||
Qt5::Widgets
|
||||
Qt6::Widgets
|
||||
)
|
||||
|
||||
NGL_INSTALL_TARGET(ConfigX)
|
||||
|
||||
@@ -15,8 +15,8 @@ SET(SettingsRemover_SRCS
|
||||
NGL_ADD_EXECUTABLE(TOOLSWS SettingsRemover ${SettingsRemover_SRCS})
|
||||
|
||||
NGL_TARGET_LINK_LIBRARIES(SettingsRemover
|
||||
Qt5::Core
|
||||
Qt5::Sql
|
||||
Qt6::Core
|
||||
Qt6::Sql
|
||||
)
|
||||
|
||||
NGL_INSTALL_TARGET(SettingsRemover)
|
||||
@@ -294,8 +294,8 @@ NGL_WRAP_UI(SRCS ui/db_update.ui ui/show_history.ui)
|
||||
NGL_ADD_EXECUTABLE(SV dbUpdate ${SRCS})
|
||||
|
||||
NGL_TARGET_LINK_LIBRARIES(dbUpdate
|
||||
Qt5::Widgets
|
||||
Qt5::Core
|
||||
Qt6::Widgets
|
||||
Qt6::Core
|
||||
nglapplication
|
||||
ngldb
|
||||
nglcoreapplication
|
||||
|
||||
@@ -15,7 +15,7 @@ SET(HDRS
|
||||
|
||||
NGL_ADD_EXECUTABLE(AAR SV NO_TRANSLATION tDataSampleGenerator ${SRCS} ${HDRS})
|
||||
NGL_TARGET_LINK_LIBRARIES(tDataSampleGenerator
|
||||
Qt5::Core
|
||||
Qt6::Core
|
||||
ddsdts
|
||||
ddsgen
|
||||
ddsconnector
|
||||
|
||||
@@ -17,7 +17,7 @@ SET(HDRS
|
||||
|
||||
NGL_ADD_EXECUTABLE(AAR SV NO_TRANSLATION tDataSampleReceiver ${SRCS} ${HDRS})
|
||||
NGL_TARGET_LINK_LIBRARIES(tDataSampleReceiver
|
||||
Qt5::Core
|
||||
Qt6::Core
|
||||
ddsdtc
|
||||
ddsgen
|
||||
ddsconnector
|
||||
|
||||
@@ -42,10 +42,10 @@ NGL_TARGET_LINK_LIBRARIES(displayPanelSimulator
|
||||
nglwidgets
|
||||
NGLLogger
|
||||
nglsettings
|
||||
Qt5::Core
|
||||
Qt5::Gui
|
||||
Qt5::Widgets
|
||||
Qt5::Network
|
||||
Qt6::Core
|
||||
Qt6::Gui
|
||||
Qt6::Widgets
|
||||
Qt6::Network
|
||||
)
|
||||
CONFIGURE_FILE(rheinmetall.jpg ${CMAKE_BINARY_DIR}/rheinmetall.jpg COPYONLY)
|
||||
|
||||
|
||||
@@ -18,8 +18,8 @@ SET(EEMFakeServer_SRCS
|
||||
NGL_ADD_EXECUTABLE(TOOLSSV NO_TRANSLATION EEMFakeServer ${EEMFakeServer_SRCS})
|
||||
NGL_TARGET_LINK_LIBRARIES(EEMFakeServer
|
||||
PUBLIC
|
||||
Qt5::Core
|
||||
Qt5::WebSockets
|
||||
Qt6::Core
|
||||
Qt6::WebSockets
|
||||
)
|
||||
|
||||
IF(NOT BUILD_RPM)
|
||||
|
||||
@@ -20,7 +20,7 @@ NGL_ADD_LIBRARY(WS GuiElementPlugin MODULE ${gui_element_SRCS})
|
||||
NGL_TARGET_INCLUDE_DIRECTORIES(GuiElementPlugin PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/..)
|
||||
|
||||
NGL_TARGET_LINK_LIBRARIES(GuiElementPlugin
|
||||
Qt5::Widgets
|
||||
Qt6::Widgets
|
||||
LtsWidgets
|
||||
LtsSession
|
||||
LtsSessionData
|
||||
|
||||
@@ -20,7 +20,7 @@ NGL_ADD_LIBRARY(WS GuiElementPlugin MODULE ${gui_element_SRCS})
|
||||
NGL_TARGET_INCLUDE_DIRECTORIES(GuiElementPlugin PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/..)
|
||||
|
||||
NGL_TARGET_LINK_LIBRARIES(GuiElementPlugin
|
||||
Qt5::Widgets
|
||||
Qt6::Widgets
|
||||
LtsWidgets
|
||||
LtsSession
|
||||
LtsSessionData
|
||||
|
||||
@@ -13,7 +13,7 @@ SET(HDRS
|
||||
|
||||
NGL_ADD_EXECUTABLE(WS AAR SV NO_TRANSLATION localDomainFinder ${SRCS} ${HDRS})
|
||||
NGL_TARGET_LINK_LIBRARIES(localDomainFinder
|
||||
Qt5::Core
|
||||
Qt6::Core
|
||||
LtsCommandLineParser
|
||||
NGLLogger
|
||||
nglcoreapplication
|
||||
|
||||
@@ -17,8 +17,8 @@ SET(participantDataGenerator_SRCS
|
||||
NGL_ADD_EXECUTABLE(AAR SV NO_TRANSLATION ParticipantDataGenerator ${participantDataGenerator_SRCS})
|
||||
|
||||
NGL_TARGET_LINK_LIBRARIES(ParticipantDataGenerator
|
||||
Qt5::Core
|
||||
Qt5::Network
|
||||
Qt6::Core
|
||||
Qt6::Network
|
||||
ddsconnector
|
||||
LtsCommandLineParser
|
||||
nglcoreapplication
|
||||
|
||||
@@ -30,8 +30,8 @@ NGL_TARGET_INCLUDE_DIRECTORIES(qledline
|
||||
NGL_TARGET_LINK_LIBRARIES(qledline
|
||||
PUBLIC
|
||||
qledmatrix
|
||||
Qt5::Core
|
||||
Qt5::Widgets
|
||||
Qt6::Core
|
||||
Qt6::Widgets
|
||||
)
|
||||
|
||||
NGL_INSTALL_TARGET(qledline)
|
||||
|
||||
@@ -25,8 +25,8 @@ NGL_TARGET_INCLUDE_DIRECTORIES(qledmatrix
|
||||
|
||||
NGL_TARGET_LINK_LIBRARIES(qledmatrix
|
||||
PUBLIC
|
||||
Qt5::Core
|
||||
Qt5::Widgets
|
||||
Qt6::Core
|
||||
Qt6::Widgets
|
||||
)
|
||||
|
||||
NGL_INSTALL_TARGET(qledmatrix)
|
||||
@@ -19,8 +19,8 @@ NGL_ADD_EXECUTABLE(TOOLSWS RestClientUi ${SRCS})
|
||||
NGL_INSTALL(WS DIRECTORY rest_templates/ DESTINATION bin/updates/)
|
||||
|
||||
NGL_TARGET_LINK_LIBRARIES(RestClientUi
|
||||
Qt5::Widgets
|
||||
Qt5::Gui
|
||||
Qt6::Widgets
|
||||
Qt6::Gui
|
||||
LtsRestClient
|
||||
)
|
||||
|
||||
|
||||
@@ -21,11 +21,11 @@ NGL_TARGET_LINK_LIBRARIES(textEditorTest
|
||||
NGLLogger
|
||||
nglsettings
|
||||
nglwidgets
|
||||
Qt5::Core
|
||||
Qt5::Gui
|
||||
Qt5::Widgets
|
||||
Qt5::Xml
|
||||
Qt5::PrintSupport
|
||||
Qt6::Core
|
||||
Qt6::Gui
|
||||
Qt6::Widgets
|
||||
Qt6::Xml
|
||||
Qt6::PrintSupport
|
||||
)
|
||||
|
||||
NGL_INSTALL_TARGET(textEditorTest)
|
||||
@@ -29,10 +29,10 @@ NGL_TARGET_INCLUDE_DIRECTORIES(vapixconfig
|
||||
|
||||
NGL_TARGET_LINK_LIBRARIES(vapixconfig
|
||||
PRIVATE
|
||||
Qt5::Network
|
||||
Qt5::Xml
|
||||
Qt6::Network
|
||||
Qt6::Xml
|
||||
PUBLIC
|
||||
Qt5::Core
|
||||
Qt6::Core
|
||||
)
|
||||
|
||||
NGL_INSTALL_TARGET(vapixconfig)
|
||||
|
||||
Reference in new issue
Block a user