Merge origin/feature/migrate-and-test-DDS-targets into feature/qt6-migration-basis-modules
Resolve merge conflicts between Qt6 migration basis modules and DDS test/target migration:
- codegen_simple.py: Keep Qt6 includes (generic_dtc_impl.h, service header)
- svc_ftc_impl.cpp.grantlee: Adopt DDS branch conditional logic ({% if ft.isCoreFt %})
- generic_dtc.h/.impl.h (include/ and Lts/): Keep Qt6 full-path includes, explicit wrapper methods for consistency
- connext.h: Add logger initialization for Requester/Replier (DDS branch enhancement)
- new_docker_build.sh:
- Add GROUP4_TARGETS for DDS tests
- Smart DOCKER_IMAGE selection (prebuilt vs ubuntu:26.04)
- Add BUILD_TESTING=ON to cmake
- Add Group 4 (DDS Tests) build step
Strategy: Preserve Qt6 migration decisions while incorporating DDS test/target changes.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
34 files changed
+617
-200
No files matched your search
@@ -38,6 +38,11 @@ NGL_TARGET_LINK_LIBRARIES(ddsgen
|
||||
LtsUtilsCoreHeaderOnly
|
||||
)
|
||||
|
||||
IF(NOT BUILD_RPM)
|
||||
NGL_INSTALL(AAR SV TARGETS ddsgen DESTINATION bin)
|
||||
NGL_INSTALL(AAR SV FILES dynamic_data_reader.h DESTINATION include/DDS/Generic)
|
||||
ENDIF()
|
||||
|
||||
# topic_type_plugin
|
||||
ADD_LIBRARY(topic_type_plugin INTERFACE)
|
||||
TARGET_SOURCES(topic_type_plugin INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/topic_type_plugin.h)
|
||||
|
||||
Reference in new issue
Block a user