Reworks CMake wiring for Qt6 codegen include order
Adds missing toolchain packages and include dirs so generated headers resolve.
This commit is contained in:
25 files changed
+388
-84
No files matched your search
@@ -18,6 +18,10 @@ SET(SRCS_common
|
||||
logger.h
|
||||
)
|
||||
|
||||
# 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 stub file to build directory (fallback when IDL files don't exist)
|
||||
CONFIGURE_FILE(
|
||||
${CMAKE_SOURCE_DIR}/include/ExerciseManagement/exm_enums.hpp.stub
|
||||
@@ -25,6 +29,7 @@ CONFIGURE_FILE(
|
||||
COPYONLY
|
||||
)
|
||||
|
||||
ENDIF()
|
||||
IF(BUILD_RTI)
|
||||
# Generate exm_enums.idl / exm.idl
|
||||
CODEGEN_IDL_SVC(SRCS_common ${xml_FILE})
|
||||
@@ -37,12 +42,6 @@ IF(BUILD_RTI)
|
||||
CODEGEN_TOPIC_TYPEDEFS(SRCS_common ${xml_FILE})
|
||||
# generate exm_[d|f]tc.h
|
||||
CODEGEN_CLIENT_TOPICS_IFC(SRCS_common ${xml_FILE})
|
||||
ELSE()
|
||||
# BUILD_RTI=OFF: Use manual stub headers from include/
|
||||
LIST(APPEND SRCS_common
|
||||
${CMAKE_SOURCE_DIR}/include/ExerciseManagement/exm_db.h
|
||||
${CMAKE_SOURCE_DIR}/include/ExerciseManagement/exm_enums.hpp
|
||||
)
|
||||
ENDIF()
|
||||
|
||||
NGL_ADD_LIBRARY(AAR SV WS HLA svcExmCommon SHARED ${SRCS_common})
|
||||
|
||||
Reference in new issue
Block a user