diff options
author | Julian Eisel <julian@blender.org> | 2022-03-14 18:39:42 +0300 |
---|---|---|
committer | Julian Eisel <julian@blender.org> | 2022-03-14 18:50:49 +0300 |
commit | 9b298cf3dbec9e246748448cc635a5055fe90c19 (patch) | |
tree | c9fb6ddaf16bec463d9d4dd5a65a8c9d285afc8f /source/blender/makesrna/intern/CMakeLists.txt | |
parent | cff6eb65804da3a06bde3c9152bec26e01a24992 (diff) |
RNA: Generate property declerations header, solving msg-bus C++ incompatibility
Lets `makesrna` generate a `RNA_prototypes.h` header with declarations for all
RNA properties. This can be included in regular source files when needing to
reference RNA properties statically.
This solves an issue on MSVC with adding such declarations in functions, like
we used to do. See 800fc1736748. Removes any such declarations and the related
FIXME comments.
Reviewed By: campbellbarton, LazyDodo, brecht
Differential Revision: https://developer.blender.org/D13837
Diffstat (limited to 'source/blender/makesrna/intern/CMakeLists.txt')
-rw-r--r-- | source/blender/makesrna/intern/CMakeLists.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/CMakeLists.txt b/source/blender/makesrna/intern/CMakeLists.txt index a0e5fc282d2..4e3a4aae727 100644 --- a/source/blender/makesrna/intern/CMakeLists.txt +++ b/source/blender/makesrna/intern/CMakeLists.txt @@ -122,6 +122,7 @@ set(APISRC string(REGEX REPLACE "rna_([a-zA-Z0-9_-]*).c" "${CMAKE_CURRENT_BINARY_DIR}/rna_\\1_gen.c" GENSRC "${DEFSRC}") list(APPEND GENSRC "${CMAKE_CURRENT_BINARY_DIR}/rna_prototypes_gen.h" + "${CMAKE_CURRENT_BINARY_DIR}/../RNA_prototypes.h" ) set_source_files_properties(${GENSRC} PROPERTIES GENERATED TRUE) @@ -188,6 +189,8 @@ set(INC # dna_type_offsets.h ${CMAKE_CURRENT_BINARY_DIR}/../../makesdna/intern + # RNA_prototypes.h + ${CMAKE_CURRENT_BINARY_DIR}/../../makesrna/ ) set(INC_SYS @@ -402,7 +405,7 @@ endif() # note (linux only): with crashes try add this after COMMAND: valgrind --leak-check=full --track-origins=yes add_custom_command( OUTPUT ${GENSRC} - COMMAND "$<TARGET_FILE:makesrna>" ${CMAKE_CURRENT_BINARY_DIR}/ + COMMAND "$<TARGET_FILE:makesrna>" ${CMAKE_CURRENT_BINARY_DIR}/ ${CMAKE_CURRENT_BINARY_DIR}/../ DEPENDS makesrna ) |