Qt6 Migration: BUILD_RTI guards und CMake fixes
- BUILD_RTI conditional compilation für RTI Connext DDS dependencies - Namespace fixes in core_dtc.h (Core:: → DDS::Core::) - CMakeLists.txt: BUILD_RTI option und conditional dependencies - Handler minelayer: namespace closing mit BUILD_RTI guard - Build erfolgreich mit BUILD_RTI=OFF validiert Signed-off-by: Torsten Wierschin <torsten.wierschin@life-maps.com>
This commit is contained in:
422 files changed
+1013
-599
No files matched your search
@@ -30,6 +30,12 @@ if(BUILD_TESTING)
|
||||
|
||||
add_executable(migration_tests ${EXISTING_SOURCES})
|
||||
|
||||
# Enable Qt Meta-Object Compiler for tests with Q_OBJECT
|
||||
set_target_properties(migration_tests PROPERTIES AUTOMOC ON)
|
||||
|
||||
# Exclude tests for non-existent or commented-out components
|
||||
list(FILTER EXISTING_SOURCES EXCLUDE REGEX "test_lts_app_descriptor_editor\\.cpp")
|
||||
|
||||
target_compile_features(migration_tests PRIVATE cxx_std_23)
|
||||
|
||||
target_include_directories(migration_tests PRIVATE
|
||||
@@ -37,18 +43,25 @@ if(BUILD_TESTING)
|
||||
${CMAKE_SOURCE_DIR}/include
|
||||
${CMAKE_SOURCE_DIR}/qt6-after/qt6-migrated-legatus
|
||||
${CMAKE_SOURCE_DIR}/qt6-after/qt6-migrated-legatus/include
|
||||
${CMAKE_SOURCE_DIR}/qt6-after/qt6-migrated-legatus/DDS
|
||||
${CMAKE_BINARY_DIR}/Lts/Common
|
||||
${CMAKE_BINARY_DIR}/Lts/Common/CodeGen
|
||||
${CMAKE_BINARY_DIR}/Lts/Common/LtsTimeline
|
||||
)
|
||||
|
||||
# Link against Qt6 components
|
||||
# Link against Qt6 components and LtsTimelineClassic (provides export header)
|
||||
target_link_libraries(migration_tests PRIVATE
|
||||
Qt6::Core
|
||||
Qt6::Gui
|
||||
Qt6::Widgets
|
||||
Qt6::Test
|
||||
GTest::gtest_main
|
||||
LtsTimelineClassic
|
||||
)
|
||||
|
||||
# Ensure LtsTimelineClassic is built before tests (generates export header)
|
||||
add_dependencies(migration_tests LtsTimelineClassic)
|
||||
|
||||
# Grantlee tests require BUILD_GRANTLEE=ON
|
||||
if(BUILD_GRANTLEE)
|
||||
target_link_libraries(migration_tests PRIVATE codegen_grantlee)
|
||||
|
||||
Reference in new issue
Block a user