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
@@ -20,75 +20,41 @@ SET(SRCS_common
|
||||
logger.h
|
||||
)
|
||||
|
||||
IF(BUILD_RTI)
|
||||
# Generate pdm_enums.idl / pdm.idl
|
||||
CODEGEN_IDL_SVC(SRCS_common ${xml_FILE})
|
||||
# Generate pdm_enums.idl / pdm.idl
|
||||
CODEGEN_IDL_SVC(SRCS_common ${xml_FILE})
|
||||
|
||||
# Generate pdm_db.h
|
||||
CODEGEN_DATABASE_STRUCTS(SRCS_common ${xml_FILE})
|
||||
# Generate pdm_db_impl.cpp/.h,
|
||||
CODEGEN_DATABASE_SQL(SRCS_common ${xml_FILE})
|
||||
# Generate pdm_db.h
|
||||
CODEGEN_DATABASE_STRUCTS(SRCS_common ${xml_FILE})
|
||||
# Generate pdm_db_impl.cpp/.h,
|
||||
CODEGEN_DATABASE_SQL(SRCS_common ${xml_FILE})
|
||||
|
||||
# Generate *.cpp/*.hpp from idl
|
||||
RTIDDSGEN(SRCS_common pdm_enums.idl)
|
||||
RTIDDSGEN(SRCS_common pdm.idl)
|
||||
# Generate *.cpp/*.hpp from idl
|
||||
RTIDDSGEN(SRCS_common pdm_enums.idl)
|
||||
RTIDDSGEN(SRCS_common pdm.idl)
|
||||
|
||||
# Generate pdm_dt[s,c]_types.h, pdm_ft[s,c]_types.h
|
||||
CODEGEN_TOPIC_TYPEDEFS(SRCS_common ${xml_FILE})
|
||||
# generate pdm_[d|f]tc.h
|
||||
CODEGEN_CLIENT_TOPICS_IFC(SRCS_common ${xml_FILE})
|
||||
ELSE()
|
||||
# Stub files for BUILD_RTI=OFF - NO code generation
|
||||
LIST(APPEND SRCS_common
|
||||
stubs/pdm_enums_stub.hpp
|
||||
stubs/pdm_stub.hpp
|
||||
stubs/pdm_db_stub.hpp
|
||||
)
|
||||
ENDIF()
|
||||
# Generate pdm_dt[s,c]_types.h, pdm_ft[s,c]_types.h
|
||||
CODEGEN_TOPIC_TYPEDEFS(SRCS_common ${xml_FILE})
|
||||
# generate pdm_[d|f]tc.h
|
||||
CODEGEN_CLIENT_TOPICS_IFC(SRCS_common ${xml_FILE})
|
||||
|
||||
# Create target only if component flags allow
|
||||
NGL_ADD_LIBRARY2(AAR SV WS HLA svcPdmCommon SHARED ${SRCS_common})
|
||||
|
||||
# Generate export header ALWAYS (needed even if target not built)
|
||||
IF(NOT TARGET svcPdmCommon)
|
||||
# Create a dummy static library just for export header generation
|
||||
ADD_LIBRARY(svcPdmCommon STATIC ${SRCS_common})
|
||||
ENDIF()
|
||||
|
||||
# Generate export header BEFORE setting include directories
|
||||
GENERATE_EXPORT_HEADER(svcPdmCommon EXPORT_FILE_NAME "svcpdmcommon_export.h")
|
||||
|
||||
# Include directories for svcPdmCommon (must include build dir for export header)
|
||||
IF(TARGET svcPdmCommon)
|
||||
TARGET_INCLUDE_DIRECTORIES(svcPdmCommon
|
||||
PUBLIC
|
||||
${CMAKE_CURRENT_SOURCE_DIR}
|
||||
${CMAKE_CURRENT_BINARY_DIR}
|
||||
${CMAKE_SOURCE_DIR}/include/ProjectDataManagement
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../
|
||||
${CMAKE_CURRENT_BINARY_DIR}/../
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/stubs
|
||||
${CMAKE_CURRENT_BINARY_DIR}/stubs
|
||||
)
|
||||
ENDIF()
|
||||
NGL_TARGET_LINK_LIBRARIES(svcPdmCommon
|
||||
NGL_ADD_LIBRARY(AAR SV WS HLA svcPdmCommon SHARED ${SRCS_common})
|
||||
NGL_TARGET_INCLUDE_DIRECTORIES(svcPdmCommon
|
||||
PUBLIC
|
||||
Qt6::Core
|
||||
NGLLogger
|
||||
LtsUtilsCore
|
||||
ngldb
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../
|
||||
${CMAKE_CURRENT_BINARY_DIR}/../
|
||||
)
|
||||
IF(BUILD_RTI)
|
||||
NGL_TARGET_LINK_LIBRARIES(svcPdmCommon
|
||||
PRIVATE
|
||||
RTI::nddscpp2
|
||||
PUBLIC
|
||||
Qt6::Core
|
||||
ddscore
|
||||
NGLLogger
|
||||
LtsUtilsCore
|
||||
ngldb
|
||||
)
|
||||
ENDIF(BUILD_RTI)
|
||||
NGL_INSTALL_TARGET(svcPdmCommon)
|
||||
|
||||
IF(BUILD_RTI)
|
||||
#
|
||||
# --- Library svcPdmClient --------------------------------------------------------------------------------
|
||||
#
|
||||
@@ -100,7 +66,7 @@ SET(SRCS_client
|
||||
# generate pdm_ftc_impl.[cpp|h]
|
||||
CODEGEN_CLIENT_TOPICS_IMPL(SRCS_client ${xml_FILE})
|
||||
|
||||
NGL_ADD_LIBRARY2(WS AAR SV HLA svcPdmClient SHARED ${SRCS_client})
|
||||
NGL_ADD_LIBRARY(WS AAR SV HLA svcPdmClient SHARED ${SRCS_client})
|
||||
NGL_TARGET_INCLUDE_DIRECTORIES(svcPdmClient
|
||||
PUBLIC
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../
|
||||
@@ -126,7 +92,7 @@ SET(SRCS_server
|
||||
# generate pdm_[d|f]ts.h, pdm_[d|f]ts_impl.[cpp|h]
|
||||
CODEGEN_SERVER_TOPICS(SRCS_server ${xml_FILE})
|
||||
|
||||
NGL_ADD_LIBRARY2(WS AAR SV svcPdmServer SHARED ${SRCS_server})
|
||||
NGL_ADD_LIBRARY(WS AAR SV svcPdmServer SHARED ${SRCS_server})
|
||||
NGL_TARGET_INCLUDE_DIRECTORIES(svcPdmServer
|
||||
PUBLIC
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../
|
||||
@@ -198,5 +164,3 @@ NGL_ADD_TARGET_LINK(svcProjectDataManagement sPDM)
|
||||
# Uncomment if necessary
|
||||
#ADD_SUBDIRECTORY(UnitTests)
|
||||
ADD_SUBDIRECTORY(ModuleTests)
|
||||
|
||||
ENDIF(BUILD_RTI)
|
||||
Reference in new issue
Block a user