Merge feature/qt6-migration-basis-modules-services into feature/qt6-migration-basis-modules
Resolves 17 conflicts against legacy Qt5 semantics; validates with BUILD_RTI=ON BUILD_GRANTLEE=ON.
This commit is contained in:
1200 files changed
+20421
-18259
No files matched your search
@@ -20,28 +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
|
||||
CONFIGURE_FILE(
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../../../include/ProjectDataManagement/pdm_translation.h
|
||||
${CMAKE_CURRENT_BINARY_DIR}/pdm_translation.h
|
||||
COPYONLY
|
||||
)
|
||||
|
||||
# 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}
|
||||
|
||||
Reference in new issue
Block a user