Reworks CMake wiring for Qt6 codegen include order

Adds missing toolchain packages and include dirs so generated headers resolve.
This commit is contained in:
berrux-dev committed 2026-09-21 02:42:27 +02:00
1 parent 220ca64679
commit cf62b17d58
25 files changed
+388 -84

No files matched your search

@@ -122,12 +122,17 @@ SET_SOURCE_FILES_PROPERTIES(list_response_collector.cpp PROPERTIES SKIP_UNITY_BU
IF(BUILD_RTI)
CODEGEN_IDL_SVC(SRCS_common ${xml_FILE})
ENDIF()
# The enums stub copy below would overwrite the rtiddsgen-generated
# <svc>_enums.hpp (RTIDDSGEN on <svc>_enums.idl writes the same build-dir
# path) on every cmake re-configure. Only keep it for BUILD_RTI=OFF.
IF(NOT BUILD_RTI)
# Stub file for compilation (fallback when no IDL exists)
CONFIGURE_FILE(
${CMAKE_SOURCE_DIR}/include/AudioVideoManagement/avm_enums.hpp.stub
${CMAKE_BINARY_DIR}/Lts/Services/AudioVideoManagement/avm_enums.hpp
COPYONLY
)
ENDIF()
# Generate avm_db.h, avm_db_impl.cpp/.h
CODEGEN_DATABASE_SQL(SRCS_common ${xml_FILE})
@@ -136,6 +141,10 @@ IF(BUILD_RTI)
RTIDDSGEN(SRCS_common avm_enums.idl)
RTIDDSGEN(SRCS_common avm.idl)
ENDIF()
# The enums stub copy below would overwrite the rtiddsgen-generated
# <svc>_enums.hpp (RTIDDSGEN on <svc>_enums.idl writes the same build-dir
# path) on every cmake re-configure. Only keep it for BUILD_RTI=OFF.
IF(NOT BUILD_RTI)
# Copy avm_enums.hpp.stub to build directory for compilation
CONFIGURE_FILE(
${CMAKE_SOURCE_DIR}/include/AudioVideoManagement/avm_enums.hpp.stub
@@ -144,6 +153,7 @@ CONFIGURE_FILE(
)
ENDIF()
# Generate avm_dt[s,c]_types.h, avm_ft[s,c]_types.h
IF(BUILD_RTI)
CODEGEN_TOPIC_TYPEDEFS(SRCS_common ${xml_FILE})
@@ -152,6 +162,10 @@ ENDIF()
IF(BUILD_RTI)
CODEGEN_CLIENT_TOPICS_IFC(SRCS_common ${xml_FILE})
ENDIF()
# The enums stub copy below would overwrite the rtiddsgen-generated
# <svc>_enums.hpp (RTIDDSGEN on <svc>_enums.idl writes the same build-dir
# path) on every cmake re-configure. Only keep it for BUILD_RTI=OFF.
IF(NOT BUILD_RTI)
# Copy avm_enums.hpp.stub to build directory for compilation
CONFIGURE_FILE(
${CMAKE_SOURCE_DIR}/include/AudioVideoManagement/avm_enums.hpp.stub
@@ -160,6 +174,7 @@ CONFIGURE_FILE(
)
ENDIF()
# Generate avm_db_structs.cpp/.h
CODEGEN_DATABASE_STRUCTS(SRCS_common ${xml_FILE})