Migrates residual Lts sources to generated rtiddsgen API
Adds NmeaManagement tests, fixes codegen includes and Qt6 SerialPort CMake target.
This commit is contained in:
1 parent
5485a90385
commit
881d44f4dd
512 files changed
+6887
-6426
No files matched your search
@@ -129,7 +129,8 @@ if(BUILD_TESTING)
|
||||
svcAesCommon svcAlmCommon svcAsmCommon svcAvmCommon svcCodCommon
|
||||
svcEemCommon svcEsmCommon svcEscCommon svcEvlCommon svcExmCommon
|
||||
svcGimCommon svcIsmCommon svcMdmCommon svcMsgCommon svcMrkCommon
|
||||
svcNomCommon svcOpmCommon svcOssCommon svcPdmCommon svcPpmCommon
|
||||
svcNomCommon svcNmeCommon svcOpmCommon svcOssCommon svcPdmCommon
|
||||
svcPpmCommon
|
||||
svcPreCommon svcRepCommon svcSomCommon svcSrmCommon svcSrpCommon
|
||||
svcTgtCommon svcWhgCommon)
|
||||
if(TARGET ${_svc_common})
|
||||
@@ -164,6 +165,15 @@ if(BUILD_TESTING)
|
||||
add_dependencies(migration_tests svcBldCommon)
|
||||
endif()
|
||||
|
||||
# test_nme_dtc / test_nmea_handler include the server-topic
|
||||
# interfaces (nme_dts.h, nme_fts.h) that CODEGEN_SERVER_TOPICS
|
||||
# generates into the svcNmeServer target - same ordering
|
||||
# requirement as the blocks above (without it a parallel make
|
||||
# can start migration_tests before those headers exist).
|
||||
if(TARGET svcNmeServer)
|
||||
add_dependencies(migration_tests svcNmeServer)
|
||||
endif()
|
||||
|
||||
# Enable Qt Meta-Object Compiler for tests with Q_OBJECT
|
||||
set_target_properties(migration_tests PROPERTIES AUTOMOC ON)
|
||||
|
||||
@@ -270,6 +280,13 @@ endif()
|
||||
target_link_libraries(migration_tests PRIVATE nglwidgets)
|
||||
endif()
|
||||
|
||||
# NmeaManagement tests instantiate the generated nme types (nme.hpp
|
||||
# default ctors, ServiceControlEnum stream operator) and the service
|
||||
# logger (logger.cpp) - both compiled into svcNmeCommon.
|
||||
if(TARGET svcNmeCommon)
|
||||
target_link_libraries(migration_tests PRIVATE svcNmeCommon)
|
||||
endif()
|
||||
|
||||
# FLM/FLT service tests include the Q_OBJECT custom headers of the
|
||||
# migrated services (flm_db_impl_custom.h, flm_dtc_impl_custom.h).
|
||||
# Their moc output references the generated bases' staticMetaObject
|
||||
|
||||
Reference in new issue
Block a user