Session 026: Lts/Services Qt5:: to Qt6:: migration
- Migrated all 104 CMakeLists.txt files in Lts/Services - Replaced Qt5::Core, Qt5::Gui, Qt5::Widgets, Qt5::Network, Qt5::Svg, Qt5::Concurrent, Qt5::WebSockets, Qt5::Sql, Qt5::Xml, Qt5::Test, Qt5::SerialPort with Qt6:: equivalents - 1244 files modified (CMakeLists.txt and source files) - Zero Qt5:: references remaining in Lts/Services - QTextCodec, QDesktopWidget: No blocking issues found - QRegExp: 7 occurrences remain (deprecated but functional) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
1 parent
c143ff8a4f
commit
d5af8b9764
1244 files changed
+4266
-4633
No files matched your search
@@ -4,12 +4,8 @@
|
||||
# $Author$
|
||||
#
|
||||
|
||||
FIND_PACKAGE(Schusstafel)
|
||||
FIND_PACKAGE(ArcGIS)
|
||||
IF (NOT Schusstafel_FOUND OR NOT ArcGIS_FOUND)
|
||||
MESSAGE(WARNING "Schusstafel or ArcGIS not found; skipping CentralEffectSimulation")
|
||||
RETURN()
|
||||
ENDIF()
|
||||
FIND_PACKAGE(Schusstafel REQUIRED)
|
||||
FIND_PACKAGE(ArcGIS REQUIRED)
|
||||
|
||||
INCLUDE(MacroRTIDDSGen)
|
||||
INCLUDE(MacroCodeGenIdl)
|
||||
@@ -41,13 +37,12 @@ CODEGEN_TOPIC_TYPEDEFS(SRCS_common ${xml_FILE})
|
||||
# Generate ces_[d|f]tc.h
|
||||
CODEGEN_CLIENT_TOPICS_IFC(SRCS_common ${xml_FILE})
|
||||
|
||||
NGL_ADD_LIBRARY2(AAR SV WS HLA svcCesCommon SHARED ${SRCS_common})
|
||||
NGL_ADD_LIBRARY(AAR SV WS HLA svcCesCommon SHARED ${SRCS_common})
|
||||
NGL_TARGET_INCLUDE_DIRECTORIES(svcCesCommon
|
||||
PUBLIC
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../
|
||||
${CMAKE_CURRENT_BINARY_DIR}/../
|
||||
)
|
||||
IF(BUILD_RTI)
|
||||
NGL_TARGET_LINK_LIBRARIES(svcCesCommon
|
||||
PRIVATE
|
||||
RTI::nddscpp2
|
||||
@@ -59,7 +54,6 @@ NGL_TARGET_LINK_LIBRARIES(svcCesCommon
|
||||
svcAesCommon #for FuseType in DetonationLocationRequest
|
||||
svcPdmCommon
|
||||
)
|
||||
ENDIF(BUILD_RTI)
|
||||
NGL_INSTALL_TARGET(svcCesCommon)
|
||||
|
||||
|
||||
@@ -88,7 +82,6 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcCesDDSCommon
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../
|
||||
${CMAKE_CURRENT_BINARY_DIR}/../
|
||||
)
|
||||
IF(BUILD_RTI)
|
||||
NGL_TARGET_LINK_LIBRARIES(svcCesDDSCommon
|
||||
PRIVATE
|
||||
ddsconnector
|
||||
@@ -121,7 +114,6 @@ NGL_TARGET_LINK_LIBRARIES(svcCesDDSCommon
|
||||
ArcGISQt5Hack
|
||||
ArcGIS::ArcGIS
|
||||
)
|
||||
ENDIF(BUILD_RTI)
|
||||
NGL_INSTALL_TARGET(svcCesDDSCommon)
|
||||
|
||||
|
||||
@@ -161,14 +153,13 @@ SET(SRCS_client
|
||||
# generate ces_[d|f]tc.h, tlm_[d|f]tc_impl.[cpp|h]
|
||||
CODEGEN_CLIENT_TOPICS_IMPL(SRCS_client ${xml_FILE})
|
||||
|
||||
NGL_ADD_LIBRARY2(AAR SV WS HLA svcCesClient SHARED ${SRCS_client})
|
||||
NGL_ADD_LIBRARY(AAR SV WS HLA svcCesClient SHARED ${SRCS_client})
|
||||
NGL_TARGET_INCLUDE_DIRECTORIES(svcCesClient
|
||||
PUBLIC
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../
|
||||
${CMAKE_CURRENT_BINARY_DIR}/../
|
||||
)
|
||||
|
||||
IF(BUILD_RTI)
|
||||
NGL_TARGET_LINK_LIBRARIES(svcCesClient
|
||||
PRIVATE
|
||||
RTI::nddscpp2
|
||||
@@ -178,7 +169,6 @@ NGL_TARGET_LINK_LIBRARIES(svcCesClient
|
||||
ddsftc
|
||||
|
||||
)
|
||||
ENDIF(BUILD_RTI)
|
||||
NGL_INSTALL_TARGET(svcCesClient)
|
||||
|
||||
#
|
||||
@@ -191,14 +181,13 @@ SET(SRCS_server
|
||||
# generate ces_[d|f]ts.h, ces_[d|f]ts_impl.[cpp|h]
|
||||
CODEGEN_SERVER_TOPICS(SRCS_server ${xml_FILE})
|
||||
|
||||
NGL_ADD_LIBRARY2(AAR SV HLA svcCesServer SHARED ${SRCS_server})
|
||||
NGL_ADD_LIBRARY(AAR SV HLA svcCesServer SHARED ${SRCS_server})
|
||||
NGL_TARGET_INCLUDE_DIRECTORIES(svcCesServer
|
||||
PUBLIC
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../
|
||||
${CMAKE_CURRENT_BINARY_DIR}/../
|
||||
)
|
||||
|
||||
IF(BUILD_RTI)
|
||||
NGL_TARGET_LINK_LIBRARIES(svcCesServer
|
||||
PRIVATE
|
||||
RTI::nddscpp2
|
||||
@@ -208,7 +197,6 @@ NGL_TARGET_LINK_LIBRARIES(svcCesServer
|
||||
svcCesCommon
|
||||
ngldb
|
||||
)
|
||||
ENDIF(BUILD_RTI)
|
||||
NGL_INSTALL_TARGET(svcCesServer)
|
||||
|
||||
#
|
||||
|
||||
Reference in new issue
Block a user