Resolves latest issues in Lts/Common Lts/DDS
This commit is contained in:
25 files changed
+537
-47
No files matched your search
@@ -37,12 +37,29 @@ CODEGEN_TOPIC_TYPEDEFS(SRCS_common ${xml_FILE})
|
||||
# generate core_[d|f]tc.h
|
||||
CODEGEN_CLIENT_TOPICS_IFC(SRCS_common ${xml_FILE})
|
||||
|
||||
# Get the generated core_dtc.h path for manual MOC handling
|
||||
SET(CORE_DTC_H_GENERATED "${CMAKE_CURRENT_BINARY_DIR}/core_dtc.h")
|
||||
|
||||
NGL_ADD_LIBRARY2(WS AAR HLA SV ddscore SHARED ${SRCS_common})
|
||||
|
||||
# Skip AUTOMOC for generated header - it will be processed manually with correct dependencies
|
||||
SET_SOURCE_FILES_PROPERTIES(${CORE_DTC_H_GENERATED} PROPERTIES SKIP_AUTOMOC ON)
|
||||
|
||||
# Ensure AUTOMOC can find generated headers - add include path
|
||||
TARGET_INCLUDE_DIRECTORIES(ddscore
|
||||
PUBLIC
|
||||
${CMAKE_CURRENT_BINARY_DIR}/../../
|
||||
)
|
||||
NGL_TARGET_INCLUDE_DIRECTORIES(ddscore
|
||||
PUBLIC
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../../
|
||||
${CMAKE_CURRENT_BINARY_DIR}/../../
|
||||
)
|
||||
|
||||
# Manually add MOC for the generated core_dtc.h with proper include paths
|
||||
QT6_WRAP_CPP(ddscore_moc_sources ${CORE_DTC_H_GENERATED}
|
||||
OPTIONS --include core_dtc.h -I${CMAKE_CURRENT_BINARY_DIR}/../.. -I${CMAKE_CURRENT_SOURCE_DIR}/../..
|
||||
)
|
||||
TARGET_SOURCES(ddscore PRIVATE ${ddscore_moc_sources})
|
||||
IF(BUILD_RTI)
|
||||
NGL_TARGET_LINK_LIBRARIES(ddscore
|
||||
PRIVATE
|
||||
|
||||
Reference in new issue
Block a user