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

@@ -20,35 +20,14 @@ SET(SRCS_common
logger.h
)
# Copy pdm_types.h to build directory
CONFIGURE_FILE(
${CMAKE_CURRENT_SOURCE_DIR}/../../../include/ProjectDataManagement/pdm_types.h
${CMAKE_CURRENT_BINARY_DIR}/pdm_types.h
COPYONLY
)
# pdm_types.h was a migration-scaffolding stub with no qt5 counterpart and
# no consumer; the stub in include/ was removed and the copy with it.
# Copy pdm_translation.h to build directory
# Only when BUILD_GRANTLEE=OFF (stub header). With BUILD_GRANTLEE=ON the
# codegen writes the real pdm_translation.h to the same build-dir path
# (see "Generating ... pdm_translation.h" in CODEGEN_IDL_SVC); copying the
# stub here would overwrite the generated file on every cmake re-configure
# and break incremental builds. Same guard pattern as pdm_enums.hpp below.
IF(NOT BUILD_GRANTLEE)
CONFIGURE_FILE(
${CMAKE_CURRENT_SOURCE_DIR}/../../../include/ProjectDataManagement/pdm_translation.h
${CMAKE_CURRENT_BINARY_DIR}/pdm_translation.h
COPYONLY
)
ENDIF()
# Copy pdm_enums.hpp to build directory (when BUILD_RTI=OFF)
IF(NOT BUILD_RTI)
CONFIGURE_FILE(
${CMAKE_CURRENT_SOURCE_DIR}/../../../include/ProjectDataManagement/pdm_enums.hpp
${CMAKE_CURRENT_BINARY_DIR}/pdm_enums.hpp
COPYONLY
)
ENDIF()
# pdm_translation.h and pdm_enums.hpp stub copies (OFF-variant fallbacks whose
# include/ sources were removed together with the other shadowing stubs):
# with BUILD_GRANTLEE=ON and BUILD_RTI=ON the codegen writes the real files to
# these build-dir paths, so the copies are gone rather than kept for forbidden
# OFF variants.
# Add current binary dir to include path for generated headers
NGL_TARGET_INCLUDE_DIRECTORIES(${PDM_COMMON_TARGET}