From 0dc484f9cce6f012edc8d7daf2342018e7c316dc Mon Sep 17 00:00:00 2001 From: Ray Molenkamp Date: Tue, 31 Dec 2024 18:23:25 +0100 Subject: [PATCH] Cleanup: CMake: Modernize bf_rna dependencies Pretty straightforward - Remove any bf_rna paths from INC - Add a dependency though LIB when missing context: https://devtalk.blender.org/t/cmake-cleanup/30260 Pull Request: https://projects.blender.org/blender/blender/pulls/132413 --- intern/cycles/blender/CMakeLists.txt | 3 +-- source/blender/animrig/CMakeLists.txt | 4 +--- source/blender/blenfont/CMakeLists.txt | 2 +- source/blender/blenkernel/CMakeLists.txt | 7 +------ source/blender/blenloader/CMakeLists.txt | 6 +----- source/blender/blentranslation/CMakeLists.txt | 2 +- source/blender/compositor/CMakeLists.txt | 2 +- source/blender/depsgraph/CMakeLists.txt | 6 +----- source/blender/draw/CMakeLists.txt | 2 +- source/blender/editors/animation/CMakeLists.txt | 6 +----- source/blender/editors/armature/CMakeLists.txt | 6 +----- source/blender/editors/asset/CMakeLists.txt | 6 +----- source/blender/editors/curve/CMakeLists.txt | 6 +----- source/blender/editors/curves/CMakeLists.txt | 5 +---- source/blender/editors/geometry/CMakeLists.txt | 6 +----- source/blender/editors/gizmo_library/CMakeLists.txt | 6 +----- source/blender/editors/gpencil_legacy/CMakeLists.txt | 6 +----- source/blender/editors/grease_pencil/CMakeLists.txt | 5 +---- source/blender/editors/id_management/CMakeLists.txt | 2 +- source/blender/editors/interface/CMakeLists.txt | 6 +----- source/blender/editors/io/CMakeLists.txt | 2 +- source/blender/editors/lattice/CMakeLists.txt | 2 +- source/blender/editors/mask/CMakeLists.txt | 2 +- source/blender/editors/mesh/CMakeLists.txt | 6 +----- source/blender/editors/metaball/CMakeLists.txt | 2 +- source/blender/editors/object/CMakeLists.txt | 6 +----- source/blender/editors/physics/CMakeLists.txt | 6 +----- source/blender/editors/render/CMakeLists.txt | 6 +----- source/blender/editors/scene/CMakeLists.txt | 2 +- source/blender/editors/screen/CMakeLists.txt | 6 +----- source/blender/editors/sculpt_paint/CMakeLists.txt | 6 +----- source/blender/editors/sound/CMakeLists.txt | 6 +----- source/blender/editors/space_action/CMakeLists.txt | 6 +----- source/blender/editors/space_api/CMakeLists.txt | 2 +- source/blender/editors/space_buttons/CMakeLists.txt | 6 +----- source/blender/editors/space_clip/CMakeLists.txt | 6 +----- source/blender/editors/space_console/CMakeLists.txt | 2 +- source/blender/editors/space_file/CMakeLists.txt | 6 +----- source/blender/editors/space_graph/CMakeLists.txt | 6 +----- source/blender/editors/space_image/CMakeLists.txt | 6 +----- source/blender/editors/space_info/CMakeLists.txt | 6 +----- source/blender/editors/space_nla/CMakeLists.txt | 6 +----- source/blender/editors/space_node/CMakeLists.txt | 6 +----- source/blender/editors/space_outliner/CMakeLists.txt | 6 +----- source/blender/editors/space_script/CMakeLists.txt | 2 +- source/blender/editors/space_sequencer/CMakeLists.txt | 6 +----- .../blender/editors/space_spreadsheet/CMakeLists.txt | 6 +----- source/blender/editors/space_statusbar/CMakeLists.txt | 6 +----- source/blender/editors/space_text/CMakeLists.txt | 2 +- source/blender/editors/space_topbar/CMakeLists.txt | 6 +----- source/blender/editors/space_userpref/CMakeLists.txt | 6 +----- source/blender/editors/space_view3d/CMakeLists.txt | 6 +----- source/blender/editors/transform/CMakeLists.txt | 6 +----- source/blender/editors/undo/CMakeLists.txt | 2 +- source/blender/editors/util/CMakeLists.txt | 6 +----- source/blender/editors/uvedit/CMakeLists.txt | 6 +----- source/blender/freestyle/CMakeLists.txt | 6 +----- source/blender/geometry/CMakeLists.txt | 2 +- source/blender/gpu/CMakeLists.txt | 2 +- source/blender/imbuf/CMakeLists.txt | 2 +- source/blender/io/alembic/CMakeLists.txt | 2 +- source/blender/io/collada/CMakeLists.txt | 2 +- source/blender/io/common/CMakeLists.txt | 2 +- source/blender/io/grease_pencil/CMakeLists.txt | 2 +- source/blender/io/ply/CMakeLists.txt | 2 +- source/blender/io/stl/CMakeLists.txt | 2 +- source/blender/io/usd/CMakeLists.txt | 6 +----- source/blender/io/wavefront_obj/CMakeLists.txt | 2 +- source/blender/makesrna/intern/CMakeLists.txt | 11 +++++------ source/blender/modifiers/CMakeLists.txt | 6 +----- source/blender/nodes/CMakeLists.txt | 6 +----- source/blender/nodes/composite/CMakeLists.txt | 6 +----- source/blender/nodes/function/CMakeLists.txt | 2 +- source/blender/nodes/geometry/CMakeLists.txt | 6 +----- source/blender/nodes/shader/CMakeLists.txt | 6 +----- source/blender/nodes/texture/CMakeLists.txt | 6 +----- source/blender/python/generic/CMakeLists.txt | 2 +- source/blender/python/intern/CMakeLists.txt | 6 +----- source/blender/render/CMakeLists.txt | 2 +- source/blender/render/hydra/CMakeLists.txt | 6 +----- source/blender/sequencer/CMakeLists.txt | 6 +----- source/blender/shader_fx/CMakeLists.txt | 6 +----- source/blender/simulation/CMakeLists.txt | 2 +- source/blender/windowmanager/CMakeLists.txt | 6 +----- source/creator/CMakeLists.txt | 2 +- 85 files changed, 89 insertions(+), 300 deletions(-) diff --git a/intern/cycles/blender/CMakeLists.txt b/intern/cycles/blender/CMakeLists.txt index 986e49b627d..fe9436ec1f2 100644 --- a/intern/cycles/blender/CMakeLists.txt +++ b/intern/cycles/blender/CMakeLists.txt @@ -5,7 +5,6 @@ set(INC .. ../../mikktspace - ../../../source/blender/makesrna ${CMAKE_BINARY_DIR}/source/blender/makesrna/intern ) @@ -61,6 +60,7 @@ set(LIB PRIVATE bf::gpu PRIVATE bf::intern::guardedalloc PRIVATE bf::render + PRIVATE bf::rna cycles_bvh cycles_device cycles_graph @@ -150,6 +150,5 @@ endif() blender_add_lib(bf_intern_cycles "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") -add_dependencies(bf_intern_cycles bf_rna) delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "${ADDON_FILES}" ${CYCLES_INSTALL_PATH}) diff --git a/source/blender/animrig/CMakeLists.txt b/source/blender/animrig/CMakeLists.txt index 1ee94cf5d8c..d0cc39e45f6 100644 --- a/source/blender/animrig/CMakeLists.txt +++ b/source/blender/animrig/CMakeLists.txt @@ -7,10 +7,7 @@ set(INC intern ../editors/include - ../makesrna ../../../extern/fmtlib/include - # RNA_prototypes.hh - ${CMAKE_BINARY_DIR}/source/blender/makesrna ) set(INC_SYS @@ -66,6 +63,7 @@ set(LIB PRIVATE bf::intern::guardedalloc PRIVATE bf::intern::atomic PRIVATE bf::intern::clog + PRIVATE bf::rna PRIVATE bf::windowmanager ) diff --git a/source/blender/blenfont/CMakeLists.txt b/source/blender/blenfont/CMakeLists.txt index c183fba775e..4393f94d551 100644 --- a/source/blender/blenfont/CMakeLists.txt +++ b/source/blender/blenfont/CMakeLists.txt @@ -4,7 +4,6 @@ set(INC PUBLIC . - ../makesrna ) set(INC_SYS @@ -33,6 +32,7 @@ set(LIB PRIVATE bf::imbuf PRIVATE bf::intern::guardedalloc ${FREETYPE_LIBRARIES} ${BROTLI_LIBRARIES} + PRIVATE bf::rna ) if(WIN32) diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt index 9a96fdae9a0..bca95e3c270 100644 --- a/source/blender/blenkernel/CMakeLists.txt +++ b/source/blender/blenkernel/CMakeLists.txt @@ -5,7 +5,6 @@ set(INC PUBLIC . ../ikplugin - ../makesrna ../modifiers ../nodes/geometry/include ../shader_fx @@ -19,8 +18,6 @@ set(INC ../../../intern/mikktspace ../../../intern/opensubdiv - # RNA_prototypes.hh - ${CMAKE_BINARY_DIR}/source/blender/makesrna ) set(INC_SYS @@ -571,7 +568,7 @@ set(LIB bf_modifiers PRIVATE bf::nodes PRIVATE bf::render - bf_rna + PRIVATE bf::rna PRIVATE bf::sequencer bf_shader_fx bf_simulation @@ -800,8 +797,6 @@ endif() blender_add_lib(bf_blenkernel "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") add_library(bf::blenkernel ALIAS bf_blenkernel) -# RNA_prototypes.hh -add_dependencies(bf_blenkernel bf_rna) if(WITH_GTESTS) diff --git a/source/blender/blenloader/CMakeLists.txt b/source/blender/blenloader/CMakeLists.txt index 18526168f21..018915571ae 100644 --- a/source/blender/blenloader/CMakeLists.txt +++ b/source/blender/blenloader/CMakeLists.txt @@ -5,10 +5,7 @@ set(INC PUBLIC . ../editors/include - ../makesrna - # RNA_prototypes.hh - ${CMAKE_BINARY_DIR}/source/blender/makesrna ) set(INC_SYS @@ -65,6 +62,7 @@ set(LIB PRIVATE bf::intern::memutil PRIVATE bf::nodes PRIVATE bf::render + PRIVATE bf::rna PRIVATE bf::sequencer PRIVATE bf::windowmanager ) @@ -91,8 +89,6 @@ endif() blender_add_lib(bf_blenloader "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") add_library(bf::blenloader ALIAS bf_blenloader) -# RNA_prototypes.hh -add_dependencies(bf_blenloader bf_rna) if(WITH_GTESTS) # Utility functions for test also used by other tests. diff --git a/source/blender/blentranslation/CMakeLists.txt b/source/blender/blentranslation/CMakeLists.txt index 1fa3570bc27..fea1ca2021d 100644 --- a/source/blender/blentranslation/CMakeLists.txt +++ b/source/blender/blentranslation/CMakeLists.txt @@ -4,7 +4,6 @@ set(INC PUBLIC . - ../makesrna ../../../intern/locale ) @@ -25,6 +24,7 @@ set(LIB PRIVATE bf::dna PRIVATE bf::imbuf PRIVATE bf::intern::guardedalloc + PRIVATE bf::rna ) if(WITH_INTERNATIONAL) diff --git a/source/blender/compositor/CMakeLists.txt b/source/blender/compositor/CMakeLists.txt index b2bd4c89131..bf3f3b69ab5 100644 --- a/source/blender/compositor/CMakeLists.txt +++ b/source/blender/compositor/CMakeLists.txt @@ -8,7 +8,6 @@ set(INC cached_resources utilities ../gpu/intern - ../makesrna ../render/intern ) @@ -151,6 +150,7 @@ set(LIB PRIVATE bf::blenlib PRIVATE bf::dna PRIVATE bf::intern::guardedalloc + PRIVATE bf::rna ) set(GLSL_SRC diff --git a/source/blender/depsgraph/CMakeLists.txt b/source/blender/depsgraph/CMakeLists.txt index 57b3852d5ac..be01c9c9ee6 100644 --- a/source/blender/depsgraph/CMakeLists.txt +++ b/source/blender/depsgraph/CMakeLists.txt @@ -5,10 +5,7 @@ set(INC PUBLIC . ../animrig - ../makesrna ../modifiers - # RNA_prototypes.hh - ${CMAKE_BINARY_DIR}/source/blender/makesrna ) set(INC_SYS @@ -154,6 +151,7 @@ set(LIB PRIVATE bf::functions PRIVATE bf::intern::atomic PRIVATE bf::intern::guardedalloc + PRIVATE bf::rna PRIVATE bf::sequencer PRIVATE bf::windowmanager ) @@ -168,8 +166,6 @@ endif() blender_add_lib(bf_depsgraph "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") add_library(bf::depsgraph ALIAS bf_depsgraph) -# RNA_prototypes.hh -add_dependencies(bf_depsgraph bf_rna) if(WITH_GTESTS) set(TEST_INC diff --git a/source/blender/draw/CMakeLists.txt b/source/blender/draw/CMakeLists.txt index 2228e0799d2..26c5a278775 100644 --- a/source/blender/draw/CMakeLists.txt +++ b/source/blender/draw/CMakeLists.txt @@ -9,7 +9,6 @@ set(INC ../editors/include ../editors/space_view3d ../gpu/intern - ../makesrna ../render/intern ../compositor ../compositor/algorithms @@ -310,6 +309,7 @@ set(LIB bf_compositor PRIVATE bf::nodes PRIVATE bf::render + PRIVATE bf::rna PRIVATE bf::windowmanager PRIVATE bf::intern::atomic PRIVATE bf::extern::fmtlib diff --git a/source/blender/editors/animation/CMakeLists.txt b/source/blender/editors/animation/CMakeLists.txt index b11ce96bcb6..079c6964cdf 100644 --- a/source/blender/editors/animation/CMakeLists.txt +++ b/source/blender/editors/animation/CMakeLists.txt @@ -4,10 +4,7 @@ set(INC ../include - ../../makesrna ../../../../extern/fmtlib/include - # RNA_prototypes.hh - ${CMAKE_BINARY_DIR}/source/blender/makesrna ) set(INC_SYS @@ -46,6 +43,7 @@ set(LIB PRIVATE bf::gpu PRIVATE bf::intern::clog PRIVATE bf::intern::guardedalloc + PRIVATE bf::rna PRIVATE bf::sequencer PRIVATE bf::windowmanager ) @@ -56,8 +54,6 @@ endif() blender_add_lib(bf_editor_animation "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") -# RNA_prototypes.hh -add_dependencies(bf_editor_animation bf_rna) if(WITH_GTESTS) set(TEST_SRC diff --git a/source/blender/editors/armature/CMakeLists.txt b/source/blender/editors/armature/CMakeLists.txt index 61667c2b22d..7b8911e0a77 100644 --- a/source/blender/editors/armature/CMakeLists.txt +++ b/source/blender/editors/armature/CMakeLists.txt @@ -4,10 +4,7 @@ set(INC ../include - ../../makesrna ../../../../intern/eigen - # RNA_prototypes.hh - ${CMAKE_BINARY_DIR}/source/blender/makesrna ) set(INC_SYS @@ -50,11 +47,10 @@ set(LIB PRIVATE bf::gpu PRIVATE bf::intern::clog PRIVATE bf::intern::guardedalloc + PRIVATE bf::rna PRIVATE bf::windowmanager ) blender_add_lib(bf_editor_armature "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") -# RNA_prototypes.hh -add_dependencies(bf_editor_armature bf_rna) diff --git a/source/blender/editors/asset/CMakeLists.txt b/source/blender/editors/asset/CMakeLists.txt index d8c6a98b6d2..b76f1215fa9 100644 --- a/source/blender/editors/asset/CMakeLists.txt +++ b/source/blender/editors/asset/CMakeLists.txt @@ -5,11 +5,8 @@ set(INC . ../include - ../../makesrna # dna_type_offsets.h ${CMAKE_CURRENT_BINARY_DIR}/../../makesdna/intern - # RNA_prototypes.hh - ${CMAKE_BINARY_DIR}/source/blender/makesrna ) set(INC_SYS @@ -60,10 +57,9 @@ set(LIB PRIVATE bf::dna PRIVATE bf::intern::clog PRIVATE bf::intern::guardedalloc + PRIVATE bf::rna PRIVATE bf::windowmanager ) blender_add_lib(bf_editor_asset "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") -# RNA_prototypes.hh -add_dependencies(bf_editor_asset bf_rna) diff --git a/source/blender/editors/curve/CMakeLists.txt b/source/blender/editors/curve/CMakeLists.txt index b6dcb36535f..c8fa1555ad6 100644 --- a/source/blender/editors/curve/CMakeLists.txt +++ b/source/blender/editors/curve/CMakeLists.txt @@ -4,9 +4,6 @@ set(INC ../include - ../../makesrna - # RNA_prototypes.hh - ${CMAKE_BINARY_DIR}/source/blender/makesrna ) set(INC_SYS @@ -38,10 +35,9 @@ set(LIB PRIVATE bf::gpu PRIVATE bf::intern::clog PRIVATE bf::intern::guardedalloc + PRIVATE bf::rna PRIVATE bf::windowmanager ) blender_add_lib(bf_editor_curve "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") -# RNA_prototypes.hh -add_dependencies(bf_editor_curve bf_rna) diff --git a/source/blender/editors/curves/CMakeLists.txt b/source/blender/editors/curves/CMakeLists.txt index 970ac69e105..5513c220720 100644 --- a/source/blender/editors/curves/CMakeLists.txt +++ b/source/blender/editors/curves/CMakeLists.txt @@ -4,10 +4,7 @@ set(INC ../include - ../../makesrna - # RNA_prototypes.hh - ${CMAKE_BINARY_DIR}/source/blender/makesrna ) set(INC_SYS @@ -41,6 +38,7 @@ set(LIB PRIVATE bf::gpu PRIVATE bf::intern::clog PRIVATE bf::intern::guardedalloc + PRIVATE bf::rna PRIVATE bf::windowmanager ) @@ -53,4 +51,3 @@ if(WITH_TBB) endif() blender_add_lib(bf_editor_curves "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") -add_dependencies(bf_editor_curves bf_rna) diff --git a/source/blender/editors/geometry/CMakeLists.txt b/source/blender/editors/geometry/CMakeLists.txt index 617683227d5..44974b40052 100644 --- a/source/blender/editors/geometry/CMakeLists.txt +++ b/source/blender/editors/geometry/CMakeLists.txt @@ -4,10 +4,7 @@ set(INC ../include - ../../makesrna - # RNA_prototypes.hh - ${CMAKE_BINARY_DIR}/source/blender/makesrna ) set(INC_SYS @@ -35,10 +32,9 @@ set(LIB PRIVATE bf::functions PRIVATE bf::intern::guardedalloc PRIVATE bf::nodes + PRIVATE bf::rna PRIVATE bf::windowmanager ) blender_add_lib(bf_editor_geometry "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") -# RNA_prototypes.hh dna_type_offsets.h -add_dependencies(bf_editor_geometry bf_rna) diff --git a/source/blender/editors/gizmo_library/CMakeLists.txt b/source/blender/editors/gizmo_library/CMakeLists.txt index b475c9514d6..7dada680486 100644 --- a/source/blender/editors/gizmo_library/CMakeLists.txt +++ b/source/blender/editors/gizmo_library/CMakeLists.txt @@ -4,10 +4,7 @@ set(INC ../include - ../../makesrna ../../../../intern/eigen - # RNA_prototypes.hh - ${CMAKE_BINARY_DIR}/source/blender/makesrna ) set(INC_SYS @@ -43,11 +40,10 @@ set(LIB PRIVATE bf::gpu PRIVATE bf::intern::clog PRIVATE bf::intern::guardedalloc + PRIVATE bf::rna PRIVATE bf::windowmanager ) blender_add_lib(bf_editor_gizmo_library "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") -# RNA_prototypes.hh -add_dependencies(bf_editor_gizmo_library bf_rna) diff --git a/source/blender/editors/gpencil_legacy/CMakeLists.txt b/source/blender/editors/gpencil_legacy/CMakeLists.txt index f333acb474a..2b9a4c8f9e2 100644 --- a/source/blender/editors/gpencil_legacy/CMakeLists.txt +++ b/source/blender/editors/gpencil_legacy/CMakeLists.txt @@ -4,9 +4,6 @@ set(INC ../include - ../../makesrna - # RNA_prototypes.hh - ${CMAKE_BINARY_DIR}/source/blender/makesrna ) set(INC_SYS @@ -37,11 +34,10 @@ set(LIB PRIVATE bf::gpu PRIVATE bf::imbuf PRIVATE bf::intern::guardedalloc + PRIVATE bf::rna PRIVATE bf::windowmanager ) blender_add_lib(bf_editor_gpencil_legacy "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") -# RNA_prototypes.hh -add_dependencies(bf_editor_gpencil_legacy bf_rna) diff --git a/source/blender/editors/grease_pencil/CMakeLists.txt b/source/blender/editors/grease_pencil/CMakeLists.txt index 919f1cef648..b94e87babd9 100644 --- a/source/blender/editors/grease_pencil/CMakeLists.txt +++ b/source/blender/editors/grease_pencil/CMakeLists.txt @@ -4,12 +4,9 @@ set(INC ../include - ../../makesrna ../../../../extern/curve_fit_nd ../sculpt_paint ../../modifiers/intern/lineart - # RNA_prototypes.hh - ${CMAKE_BINARY_DIR}/source/blender/makesrna ) set(INC_SYS @@ -52,13 +49,13 @@ set(LIB PRIVATE bf::imbuf PRIVATE bf::intern::guardedalloc PRIVATE bf::intern::clog + PRIVATE bf::rna PRIVATE bf::windowmanager extern_curve_fit_nd extern_fmtlib ) blender_add_lib(bf_editor_grease_pencil "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") -add_dependencies(bf_editor_curves bf_rna) if(WITH_GTESTS) set(TEST_SRC diff --git a/source/blender/editors/id_management/CMakeLists.txt b/source/blender/editors/id_management/CMakeLists.txt index 67b16923cd4..62ea2b7d140 100644 --- a/source/blender/editors/id_management/CMakeLists.txt +++ b/source/blender/editors/id_management/CMakeLists.txt @@ -4,7 +4,6 @@ set(INC ../include - ../../makesrna ) set(INC_SYS @@ -16,6 +15,7 @@ set(SRC set(LIB PRIVATE bf::blenkernel + PRIVATE bf::rna PRIVATE bf::windowmanager PRIVATE bf::blenlib PRIVATE bf::dna diff --git a/source/blender/editors/interface/CMakeLists.txt b/source/blender/editors/interface/CMakeLists.txt index aeafe2d767c..8a32fe61474 100644 --- a/source/blender/editors/interface/CMakeLists.txt +++ b/source/blender/editors/interface/CMakeLists.txt @@ -6,11 +6,8 @@ set(INC . ../asset ../include - ../../makesrna ../../python ../../../../intern/ghost - # RNA_prototypes.hh - ${CMAKE_BINARY_DIR}/source/blender/makesrna ) set(INC_SYS @@ -109,6 +106,7 @@ set(LIB PRIVATE bf::animrig PRIVATE bf::nodes PRIVATE bf::render + PRIVATE bf::rna PRIVATE bf::windowmanager ) @@ -130,8 +128,6 @@ endif() blender_add_lib(bf_editor_interface "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") -# RNA_prototypes.hh -add_dependencies(bf_editor_interface bf_rna) if(WITH_GTESTS) set(TEST_INC diff --git a/source/blender/editors/io/CMakeLists.txt b/source/blender/editors/io/CMakeLists.txt index 40e9ee1a014..4ffd1d99d2e 100644 --- a/source/blender/editors/io/CMakeLists.txt +++ b/source/blender/editors/io/CMakeLists.txt @@ -12,7 +12,6 @@ set(INC ../../io/stl ../../io/usd ../../io/wavefront_obj - ../../makesrna ${CMAKE_BINARY_DIR}/source/blender/makesrna ) @@ -56,6 +55,7 @@ set(LIB PRIVATE bf::extern::fmtlib PRIVATE bf::intern::guardedalloc PRIVATE bf::intern::clog + PRIVATE bf::rna PRIVATE bf::windowmanager ) diff --git a/source/blender/editors/lattice/CMakeLists.txt b/source/blender/editors/lattice/CMakeLists.txt index e88878c6e2f..b85b04d78fe 100644 --- a/source/blender/editors/lattice/CMakeLists.txt +++ b/source/blender/editors/lattice/CMakeLists.txt @@ -4,7 +4,6 @@ set(INC ../include - ../../makesrna ) set(INC_SYS @@ -28,6 +27,7 @@ set(LIB PRIVATE bf::intern::clog PRIVATE bf::intern::guardedalloc PRIVATE bf::render + PRIVATE bf::rna PRIVATE bf::windowmanager ) diff --git a/source/blender/editors/mask/CMakeLists.txt b/source/blender/editors/mask/CMakeLists.txt index 5c8d78c9db0..275f81ac4a0 100644 --- a/source/blender/editors/mask/CMakeLists.txt +++ b/source/blender/editors/mask/CMakeLists.txt @@ -4,7 +4,6 @@ set(INC ../include - ../../makesrna ) set(INC_SYS @@ -33,6 +32,7 @@ set(LIB PRIVATE bf::gpu PRIVATE bf::intern::guardedalloc PRIVATE bf::animrig + PRIVATE bf::rna PRIVATE bf::windowmanager ) diff --git a/source/blender/editors/mesh/CMakeLists.txt b/source/blender/editors/mesh/CMakeLists.txt index d35837e5f47..63d456ff9a0 100644 --- a/source/blender/editors/mesh/CMakeLists.txt +++ b/source/blender/editors/mesh/CMakeLists.txt @@ -5,9 +5,6 @@ set(INC ../include ../uvedit - ../../makesrna - # RNA_prototypes.hh - ${CMAKE_BINARY_DIR}/source/blender/makesrna ) set(INC_SYS @@ -68,6 +65,7 @@ set(LIB PRIVATE bf::intern::clog PRIVATE bf::intern::guardedalloc PRIVATE bf::render + PRIVATE bf::rna PRIVATE bf::windowmanager ) @@ -85,5 +83,3 @@ endif() blender_add_lib(bf_editor_mesh "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") -# RNA_prototypes.hh -add_dependencies(bf_editor_mesh bf_rna) diff --git a/source/blender/editors/metaball/CMakeLists.txt b/source/blender/editors/metaball/CMakeLists.txt index 1e58d40cb77..a179bdea4db 100644 --- a/source/blender/editors/metaball/CMakeLists.txt +++ b/source/blender/editors/metaball/CMakeLists.txt @@ -4,7 +4,6 @@ set(INC ../include - ../../makesrna ) set(INC_SYS @@ -29,6 +28,7 @@ set(LIB PRIVATE bf::intern::clog PRIVATE bf::intern::guardedalloc PRIVATE bf::render + PRIVATE bf::rna PRIVATE bf::windowmanager ) diff --git a/source/blender/editors/object/CMakeLists.txt b/source/blender/editors/object/CMakeLists.txt index 612cbec9a07..f86bb576a0c 100644 --- a/source/blender/editors/object/CMakeLists.txt +++ b/source/blender/editors/object/CMakeLists.txt @@ -5,13 +5,10 @@ set(INC ../include ../../ikplugin - ../../makesrna ../../modifiers ../../python ../../shader_fx - # RNA_prototypes.hh - ${CMAKE_BINARY_DIR}/source/blender/makesrna ) set(INC_SYS @@ -70,6 +67,7 @@ set(LIB PRIVATE bf::intern::clog PRIVATE bf::intern::guardedalloc PRIVATE bf::render + PRIVATE bf::rna PRIVATE bf::windowmanager ) @@ -85,5 +83,3 @@ endif() blender_add_lib(bf_editor_object "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") -# RNA_prototypes.hh -add_dependencies(bf_editor_object bf_rna) diff --git a/source/blender/editors/physics/CMakeLists.txt b/source/blender/editors/physics/CMakeLists.txt index 2778b0a08dd..ad9d5e20d6f 100644 --- a/source/blender/editors/physics/CMakeLists.txt +++ b/source/blender/editors/physics/CMakeLists.txt @@ -4,10 +4,7 @@ set(INC ../include - ../../makesrna ../../../../intern/mantaflow/extern - # RNA_prototypes.hh - ${CMAKE_BINARY_DIR}/source/blender/makesrna ) set(INC_SYS @@ -39,6 +36,7 @@ set(LIB PRIVATE bf::gpu PRIVATE bf::intern::clog PRIVATE bf::intern::guardedalloc + PRIVATE bf::rna PRIVATE bf::windowmanager ) @@ -59,5 +57,3 @@ endif() blender_add_lib(bf_editor_physics "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") -# RNA_prototypes.hh -add_dependencies(bf_editor_physics bf_rna) diff --git a/source/blender/editors/render/CMakeLists.txt b/source/blender/editors/render/CMakeLists.txt index 4b7252c55a8..7ce1f762f08 100644 --- a/source/blender/editors/render/CMakeLists.txt +++ b/source/blender/editors/render/CMakeLists.txt @@ -4,9 +4,6 @@ set(INC ../include - ../../makesrna - # RNA_prototypes.hh - ${CMAKE_BINARY_DIR}/source/blender/makesrna ) set(INC_SYS @@ -40,6 +37,7 @@ set(LIB PRIVATE bf::animrig PRIVATE bf::nodes PRIVATE bf::render + PRIVATE bf::rna PRIVATE bf::sequencer PRIVATE bf::windowmanager ) @@ -70,5 +68,3 @@ endif() blender_add_lib(bf_editor_render "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") -# RNA_prototypes.hh -add_dependencies(bf_editor_render bf_rna) diff --git a/source/blender/editors/scene/CMakeLists.txt b/source/blender/editors/scene/CMakeLists.txt index d32d28ac60f..c7f5da63ad7 100644 --- a/source/blender/editors/scene/CMakeLists.txt +++ b/source/blender/editors/scene/CMakeLists.txt @@ -4,7 +4,6 @@ set(INC ../include - ../../makesrna ) set(INC_SYS @@ -23,6 +22,7 @@ set(LIB PRIVATE bf::depsgraph PRIVATE bf::dna PRIVATE bf::intern::guardedalloc + PRIVATE bf::rna PRIVATE bf::sequencer PRIVATE bf::windowmanager ) diff --git a/source/blender/editors/screen/CMakeLists.txt b/source/blender/editors/screen/CMakeLists.txt index 86cda299108..fd3d63fc885 100644 --- a/source/blender/editors/screen/CMakeLists.txt +++ b/source/blender/editors/screen/CMakeLists.txt @@ -5,10 +5,7 @@ set(INC ../asset ../include - ../../makesrna ../../../../extern/fmtlib/include - # RNA_prototypes.hh - ${CMAKE_BINARY_DIR}/source/blender/makesrna ) set(INC_SYS @@ -50,6 +47,7 @@ set(LIB PRIVATE bf::imbuf PRIVATE bf::intern::guardedalloc PRIVATE bf::extern::fmtlib + PRIVATE bf::rna PRIVATE bf::sequencer PRIVATE bf::windowmanager ) @@ -60,5 +58,3 @@ endif() blender_add_lib(bf_editor_screen "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") -# RNA_prototypes.hh -add_dependencies(bf_editor_screen bf_rna) diff --git a/source/blender/editors/sculpt_paint/CMakeLists.txt b/source/blender/editors/sculpt_paint/CMakeLists.txt index 44431516a92..1d01c68729b 100644 --- a/source/blender/editors/sculpt_paint/CMakeLists.txt +++ b/source/blender/editors/sculpt_paint/CMakeLists.txt @@ -9,10 +9,7 @@ set(INC ../include ../uvedit ../../blenlib - ../../makesrna ../../../../intern/eigen - # RNA_prototypes.hh - ${CMAKE_BINARY_DIR}/source/blender/makesrna ) set(INC_SYS @@ -187,6 +184,7 @@ set(LIB PRIVATE bf::intern::guardedalloc PRIVATE bf::nodes PRIVATE bf::render + PRIVATE bf::rna PRIVATE bf::windowmanager ) @@ -224,5 +222,3 @@ if(WITH_TBB AND MSVC_CLANG) endif() blender_add_lib(bf_editor_sculpt_paint "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") -# RNA_prototypes.hh -add_dependencies(bf_editor_sculpt_paint bf_rna) diff --git a/source/blender/editors/sound/CMakeLists.txt b/source/blender/editors/sound/CMakeLists.txt index 8e3411da00d..5ac3fb2156d 100644 --- a/source/blender/editors/sound/CMakeLists.txt +++ b/source/blender/editors/sound/CMakeLists.txt @@ -4,9 +4,6 @@ set(INC ../include - ../../makesrna - # RNA_prototypes.hh - ${CMAKE_BINARY_DIR}/source/blender/makesrna ) set(INC_SYS @@ -25,6 +22,7 @@ set(LIB PRIVATE bf::depsgraph PRIVATE bf::dna PRIVATE bf::intern::guardedalloc + PRIVATE bf::rna PRIVATE bf::sequencer PRIVATE bf::windowmanager ) @@ -55,5 +53,3 @@ endif() blender_add_lib(bf_editor_sound "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") -# RNA_prototypes.hh -add_dependencies(bf_editor_sound bf_rna) diff --git a/source/blender/editors/space_action/CMakeLists.txt b/source/blender/editors/space_action/CMakeLists.txt index fb236c93ee6..4e00caf8bcb 100644 --- a/source/blender/editors/space_action/CMakeLists.txt +++ b/source/blender/editors/space_action/CMakeLists.txt @@ -4,11 +4,8 @@ set(INC ../include - ../../makesrna ../../modifiers - # RNA_prototypes.hh - ${CMAKE_BINARY_DIR}/source/blender/makesrna ) set(INC_SYS @@ -37,10 +34,9 @@ set(LIB PRIVATE bf::gpu PRIVATE bf::intern::guardedalloc PRIVATE bf::animrig + PRIVATE bf::rna PRIVATE bf::windowmanager ) blender_add_lib(bf_editor_space_action "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") -# RNA_prototypes.hh dna_type_offsets.h -add_dependencies(bf_editor_space_action bf_rna) diff --git a/source/blender/editors/space_api/CMakeLists.txt b/source/blender/editors/space_api/CMakeLists.txt index a02675813ba..2026422866d 100644 --- a/source/blender/editors/space_api/CMakeLists.txt +++ b/source/blender/editors/space_api/CMakeLists.txt @@ -5,7 +5,6 @@ set(INC ../include ../io - ../../makesrna ) set(INC_SYS @@ -43,6 +42,7 @@ set(LIB bf_editor_space_view3d PRIVATE bf::gpu PRIVATE bf::intern::guardedalloc + PRIVATE bf::rna PRIVATE bf::windowmanager ) diff --git a/source/blender/editors/space_buttons/CMakeLists.txt b/source/blender/editors/space_buttons/CMakeLists.txt index 08ad313017e..f20e7183b15 100644 --- a/source/blender/editors/space_buttons/CMakeLists.txt +++ b/source/blender/editors/space_buttons/CMakeLists.txt @@ -4,10 +4,7 @@ set(INC ../include - ../../makesrna - # RNA_prototypes.hh - ${CMAKE_BINARY_DIR}/source/blender/makesrna ) set(INC_SYS @@ -31,6 +28,7 @@ set(LIB PRIVATE bf::dna PRIVATE bf::gpu PRIVATE bf::intern::guardedalloc + PRIVATE bf::rna PRIVATE bf::windowmanager ) @@ -46,5 +44,3 @@ endif() blender_add_lib(bf_editor_space_buttons "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") -# RNA_prototypes.hh dna_type_offsets.h -add_dependencies(bf_editor_space_buttons bf_rna) diff --git a/source/blender/editors/space_clip/CMakeLists.txt b/source/blender/editors/space_clip/CMakeLists.txt index 43d114cc96a..52b3309f599 100644 --- a/source/blender/editors/space_clip/CMakeLists.txt +++ b/source/blender/editors/space_clip/CMakeLists.txt @@ -4,10 +4,7 @@ set(INC ../include - ../../makesrna - # RNA_prototypes.hh - ${CMAKE_BINARY_DIR}/source/blender/makesrna ) set(INC_SYS @@ -50,10 +47,9 @@ set(LIB PRIVATE bf::imbuf PRIVATE bf::imbuf::movie PRIVATE bf::intern::guardedalloc + PRIVATE bf::rna PRIVATE bf::windowmanager ) blender_add_lib(bf_editor_space_clip "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") -# RNA_prototypes.hh -add_dependencies(bf_editor_space_clip bf_rna) diff --git a/source/blender/editors/space_console/CMakeLists.txt b/source/blender/editors/space_console/CMakeLists.txt index a4a03168d42..d75370211de 100644 --- a/source/blender/editors/space_console/CMakeLists.txt +++ b/source/blender/editors/space_console/CMakeLists.txt @@ -4,7 +4,6 @@ set(INC ../include - ../../makesrna ) @@ -27,6 +26,7 @@ set(LIB PRIVATE bf::dna PRIVATE bf::gpu PRIVATE bf::intern::guardedalloc + PRIVATE bf::rna PRIVATE bf::windowmanager ) diff --git a/source/blender/editors/space_file/CMakeLists.txt b/source/blender/editors/space_file/CMakeLists.txt index 794c1534177..d9cd4c7c6d1 100644 --- a/source/blender/editors/space_file/CMakeLists.txt +++ b/source/blender/editors/space_file/CMakeLists.txt @@ -5,10 +5,7 @@ set(INC ../asset ../include - ../../makesrna - # RNA_prototypes.hh - ${CMAKE_BINARY_DIR}/source/blender/makesrna ) set(INC_SYS @@ -50,6 +47,7 @@ set(LIB PRIVATE bf::extern::fmtlib PRIVATE bf::intern::atomic PRIVATE bf::render + PRIVATE bf::rna PRIVATE bf::windowmanager ) @@ -90,5 +88,3 @@ endif() blender_add_lib(bf_editor_space_file "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") -# RNA_prototypes.hh dna_type_offsets.h -add_dependencies(bf_editor_space_file bf_rna) diff --git a/source/blender/editors/space_graph/CMakeLists.txt b/source/blender/editors/space_graph/CMakeLists.txt index 7734f38e625..8cf5553d198 100644 --- a/source/blender/editors/space_graph/CMakeLists.txt +++ b/source/blender/editors/space_graph/CMakeLists.txt @@ -4,10 +4,7 @@ set(INC ../include - ../../makesrna - # RNA_prototypes.hh - ${CMAKE_BINARY_DIR}/source/blender/makesrna ) set(INC_SYS @@ -37,6 +34,7 @@ set(LIB PRIVATE bf::gpu PRIVATE bf::intern::guardedalloc PRIVATE bf::animrig + PRIVATE bf::rna PRIVATE bf::windowmanager ) @@ -59,5 +57,3 @@ endif() blender_add_lib(bf_editor_space_graph "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") -# RNA_prototypes.hh dna_type_offsets.h -add_dependencies(bf_editor_space_graph bf_rna) diff --git a/source/blender/editors/space_image/CMakeLists.txt b/source/blender/editors/space_image/CMakeLists.txt index 9b16f53b283..100e239df2a 100644 --- a/source/blender/editors/space_image/CMakeLists.txt +++ b/source/blender/editors/space_image/CMakeLists.txt @@ -5,10 +5,7 @@ set(INC ../asset ../include - ../../makesrna - # RNA_prototypes.hh - ${CMAKE_BINARY_DIR}/source/blender/makesrna ) set(INC_SYS @@ -43,6 +40,7 @@ set(LIB PRIVATE bf::intern::clog PRIVATE bf::intern::guardedalloc PRIVATE bf::render + PRIVATE bf::rna PRIVATE bf::windowmanager ) @@ -65,5 +63,3 @@ endif() blender_add_lib(bf_editor_space_image "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") -# RNA_prototypes.hh dna_type_offsets.h -add_dependencies(bf_editor_space_image bf_rna) diff --git a/source/blender/editors/space_info/CMakeLists.txt b/source/blender/editors/space_info/CMakeLists.txt index 299b27605c1..28c8bcf358a 100644 --- a/source/blender/editors/space_info/CMakeLists.txt +++ b/source/blender/editors/space_info/CMakeLists.txt @@ -4,10 +4,7 @@ set(INC ../include - ../../makesrna - # RNA_prototypes.hh - ${CMAKE_BINARY_DIR}/source/blender/makesrna ) set(INC_SYS @@ -38,11 +35,10 @@ set(LIB PRIVATE bf::imbuf PRIVATE bf::intern::guardedalloc PRIVATE bf::extern::fmtlib + PRIVATE bf::rna PRIVATE bf::windowmanager ) blender_add_lib(bf_editor_space_info "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") -# RNA_prototypes.hh dna_type_offsets.h -add_dependencies(bf_editor_space_info bf_rna) diff --git a/source/blender/editors/space_nla/CMakeLists.txt b/source/blender/editors/space_nla/CMakeLists.txt index 5a48d7da7bf..4e63c24f444 100644 --- a/source/blender/editors/space_nla/CMakeLists.txt +++ b/source/blender/editors/space_nla/CMakeLists.txt @@ -4,10 +4,7 @@ set(INC ../include - ../../makesrna - # RNA_prototypes.hh - ${CMAKE_BINARY_DIR}/source/blender/makesrna ) set(INC_SYS @@ -35,10 +32,9 @@ set(LIB PRIVATE bf::dna PRIVATE bf::gpu PRIVATE bf::intern::guardedalloc + PRIVATE bf::rna PRIVATE bf::windowmanager ) blender_add_lib(bf_editor_space_nla "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") -# RNA_prototypes.hh dna_type_offsets.h -add_dependencies(bf_editor_space_nla bf_rna) diff --git a/source/blender/editors/space_node/CMakeLists.txt b/source/blender/editors/space_node/CMakeLists.txt index c55e0b2085d..11a77c1d06c 100644 --- a/source/blender/editors/space_node/CMakeLists.txt +++ b/source/blender/editors/space_node/CMakeLists.txt @@ -6,10 +6,7 @@ set(INC ../include ../io ../../compositor - ../../makesrna - # RNA_prototypes.hh - ${CMAKE_BINARY_DIR}/source/blender/makesrna ) set(INC_SYS @@ -59,6 +56,7 @@ set(LIB PRIVATE bf::extern::fmtlib PRIVATE bf::nodes PRIVATE bf::render + PRIVATE bf::rna PRIVATE bf::windowmanager ) @@ -94,5 +92,3 @@ endif() blender_add_lib(bf_editor_space_node "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") -# RNA_prototypes.hh dna_type_offsets.h -add_dependencies(bf_editor_space_node bf_rna) diff --git a/source/blender/editors/space_outliner/CMakeLists.txt b/source/blender/editors/space_outliner/CMakeLists.txt index 301d8b19679..5f2a193f9d6 100644 --- a/source/blender/editors/space_outliner/CMakeLists.txt +++ b/source/blender/editors/space_outliner/CMakeLists.txt @@ -5,12 +5,9 @@ set(INC ../include ../../blenfont - ../../makesrna ../../../../extern/fmtlib/include - # RNA_prototypes.hh - ${CMAKE_BINARY_DIR}/source/blender/makesrna ) set(INC_SYS @@ -140,6 +137,7 @@ set(LIB PRIVATE bf::imbuf PRIVATE bf::intern::clog PRIVATE bf::intern::guardedalloc + PRIVATE bf::rna PRIVATE bf::sequencer PRIVATE bf::windowmanager extern_fmtlib @@ -148,5 +146,3 @@ set(LIB blender_add_lib(bf_editor_space_outliner "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") -# RNA_prototypes.hh dna_type_offsets.h -add_dependencies(bf_editor_space_outliner bf_rna) diff --git a/source/blender/editors/space_script/CMakeLists.txt b/source/blender/editors/space_script/CMakeLists.txt index ffe6e0430c8..cac69ae05cc 100644 --- a/source/blender/editors/space_script/CMakeLists.txt +++ b/source/blender/editors/space_script/CMakeLists.txt @@ -4,7 +4,6 @@ set(INC ../include - ../../makesrna ) @@ -27,6 +26,7 @@ set(LIB PRIVATE bf::dna PRIVATE bf::gpu PRIVATE bf::intern::guardedalloc + PRIVATE bf::rna PRIVATE bf::windowmanager ) diff --git a/source/blender/editors/space_sequencer/CMakeLists.txt b/source/blender/editors/space_sequencer/CMakeLists.txt index 27121892c3b..5afd42d1f65 100644 --- a/source/blender/editors/space_sequencer/CMakeLists.txt +++ b/source/blender/editors/space_sequencer/CMakeLists.txt @@ -4,10 +4,7 @@ set(INC ../include - ../../makesrna - # RNA_prototypes.hh - ${CMAKE_BINARY_DIR}/source/blender/makesrna ) set(INC_SYS @@ -61,6 +58,7 @@ set(LIB PRIVATE bf::intern::atomic PRIVATE bf::intern::guardedalloc PRIVATE bf::animrig + PRIVATE bf::rna PRIVATE bf::sequencer PRIVATE bf::windowmanager ) @@ -81,5 +79,3 @@ endif() blender_add_lib(bf_editor_space_sequencer "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") -# RNA_prototypes.hh dna_type_offsets.h -add_dependencies(bf_editor_space_sequencer bf_rna) diff --git a/source/blender/editors/space_spreadsheet/CMakeLists.txt b/source/blender/editors/space_spreadsheet/CMakeLists.txt index 930ae24968e..cd6cc2599f4 100644 --- a/source/blender/editors/space_spreadsheet/CMakeLists.txt +++ b/source/blender/editors/space_spreadsheet/CMakeLists.txt @@ -4,10 +4,7 @@ set(INC ../include - ../../makesrna - # RNA_prototypes.hh - ${CMAKE_BINARY_DIR}/source/blender/makesrna ) set(INC_SYS @@ -54,6 +51,7 @@ set(LIB PRIVATE bf::gpu PRIVATE bf::intern::guardedalloc PRIVATE bf::nodes + PRIVATE bf::rna PRIVATE bf::windowmanager ) @@ -72,5 +70,3 @@ endif() blender_add_lib(bf_editor_space_spreadsheet "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") -# RNA_prototypes.hh dna_type_offsets.h -add_dependencies(bf_editor_space_spreadsheet bf_rna) diff --git a/source/blender/editors/space_statusbar/CMakeLists.txt b/source/blender/editors/space_statusbar/CMakeLists.txt index 6b14d67253d..4c99c6731d4 100644 --- a/source/blender/editors/space_statusbar/CMakeLists.txt +++ b/source/blender/editors/space_statusbar/CMakeLists.txt @@ -4,10 +4,7 @@ set(INC ../include - ../../makesrna - # RNA_prototypes.hh - ${CMAKE_BINARY_DIR}/source/blender/makesrna ) set(INC_SYS @@ -25,11 +22,10 @@ set(LIB PRIVATE bf::dna PRIVATE bf::gpu PRIVATE bf::intern::guardedalloc + PRIVATE bf::rna PRIVATE bf::windowmanager ) blender_add_lib(bf_editor_space_statusbar "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") -# RNA_prototypes.hh dna_type_offsets.h -add_dependencies(bf_editor_space_statusbar bf_rna) diff --git a/source/blender/editors/space_text/CMakeLists.txt b/source/blender/editors/space_text/CMakeLists.txt index 79317339089..e04525650d0 100644 --- a/source/blender/editors/space_text/CMakeLists.txt +++ b/source/blender/editors/space_text/CMakeLists.txt @@ -4,7 +4,6 @@ set(INC ../include - ../../makesrna ) @@ -38,6 +37,7 @@ set(LIB PRIVATE bf::dna PRIVATE bf::gpu PRIVATE bf::intern::guardedalloc + PRIVATE bf::rna PRIVATE bf::windowmanager ) diff --git a/source/blender/editors/space_topbar/CMakeLists.txt b/source/blender/editors/space_topbar/CMakeLists.txt index 59cff35662f..ff950ffa4ff 100644 --- a/source/blender/editors/space_topbar/CMakeLists.txt +++ b/source/blender/editors/space_topbar/CMakeLists.txt @@ -4,10 +4,7 @@ set(INC ../include - ../../makesrna - # RNA_prototypes.hh - ${CMAKE_BINARY_DIR}/source/blender/makesrna ) set(INC_SYS @@ -25,6 +22,7 @@ set(LIB PRIVATE bf::dna PRIVATE bf::gpu PRIVATE bf::intern::guardedalloc + PRIVATE bf::rna PRIVATE bf::windowmanager ) @@ -32,5 +30,3 @@ set(LIB blender_add_lib(bf_editor_space_topbar "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") -# RNA_prototypes.hh dna_type_offsets.h -add_dependencies(bf_editor_space_topbar bf_rna) diff --git a/source/blender/editors/space_userpref/CMakeLists.txt b/source/blender/editors/space_userpref/CMakeLists.txt index f1c65bc09ec..ff102902464 100644 --- a/source/blender/editors/space_userpref/CMakeLists.txt +++ b/source/blender/editors/space_userpref/CMakeLists.txt @@ -4,10 +4,7 @@ set(INC ../include - ../../makesrna - # RNA_prototypes.hh - ${CMAKE_BINARY_DIR}/source/blender/makesrna ) set(INC_SYS @@ -30,10 +27,9 @@ set(LIB PRIVATE bf::dna PRIVATE bf::extern::fmtlib PRIVATE bf::intern::guardedalloc + PRIVATE bf::rna PRIVATE bf::windowmanager ) blender_add_lib(bf_editor_space_userpref "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") -# RNA_prototypes.hh -add_dependencies(bf_editor_space_userpref bf_rna) diff --git a/source/blender/editors/space_view3d/CMakeLists.txt b/source/blender/editors/space_view3d/CMakeLists.txt index 7bc06d32225..6dc29513ec9 100644 --- a/source/blender/editors/space_view3d/CMakeLists.txt +++ b/source/blender/editors/space_view3d/CMakeLists.txt @@ -5,12 +5,9 @@ set(INC ../asset ../include - ../../makesrna ../../modifiers ../../../../intern/mantaflow/extern - # RNA_prototypes.hh - ${CMAKE_BINARY_DIR}/source/blender/makesrna ) set(INC_SYS @@ -90,6 +87,7 @@ set(LIB PRIVATE bf::intern::guardedalloc PRIVATE bf::nodes PRIVATE bf::render + PRIVATE bf::rna PRIVATE bf::windowmanager ) @@ -108,5 +106,3 @@ endif() blender_add_lib(bf_editor_space_view3d "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") -# RNA_prototypes.hh -add_dependencies(bf_editor_space_view3d bf_rna) diff --git a/source/blender/editors/transform/CMakeLists.txt b/source/blender/editors/transform/CMakeLists.txt index a44e09ed96d..1344731f99b 100644 --- a/source/blender/editors/transform/CMakeLists.txt +++ b/source/blender/editors/transform/CMakeLists.txt @@ -5,9 +5,6 @@ set(INC ../include ../../ikplugin - ../../makesrna - # RNA_prototypes.hh - ${CMAKE_BINARY_DIR}/source/blender/makesrna ) set(INC_SYS ) @@ -118,11 +115,10 @@ set(LIB PRIVATE bf::gpu PRIVATE bf::intern::guardedalloc PRIVATE bf::render + PRIVATE bf::rna PRIVATE bf::sequencer PRIVATE bf::windowmanager ) blender_add_lib(bf_editor_transform "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") -# RNA_prototypes.hh -add_dependencies(bf_editor_transform bf_rna) diff --git a/source/blender/editors/undo/CMakeLists.txt b/source/blender/editors/undo/CMakeLists.txt index 02ebb7dd9a0..a22c9ce3ee8 100644 --- a/source/blender/editors/undo/CMakeLists.txt +++ b/source/blender/editors/undo/CMakeLists.txt @@ -4,7 +4,6 @@ set(INC ../include - ../../makesrna ) set(INC_SYS @@ -28,6 +27,7 @@ set(LIB PRIVATE bf::dna PRIVATE bf::intern::clog PRIVATE bf::intern::guardedalloc + PRIVATE bf::rna PRIVATE bf::windowmanager ) diff --git a/source/blender/editors/util/CMakeLists.txt b/source/blender/editors/util/CMakeLists.txt index 8d2d2527755..7aacdc2f7ce 100644 --- a/source/blender/editors/util/CMakeLists.txt +++ b/source/blender/editors/util/CMakeLists.txt @@ -5,9 +5,6 @@ set(INC ../include ../space_sequencer - ../../makesrna - # RNA_prototypes.hh - ${CMAKE_BINARY_DIR}/source/blender/makesrna ) set(INC_SYS @@ -114,6 +111,7 @@ set(LIB PRIVATE bf::imbuf PRIVATE bf::intern::clog PRIVATE bf::intern::guardedalloc + PRIVATE bf::rna PRIVATE bf::sequencer PRIVATE bf::windowmanager ) @@ -128,5 +126,3 @@ endif() blender_add_lib(bf_editor_util "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") -# RNA_prototypes.hh -add_dependencies(bf_editor_util bf_rna) diff --git a/source/blender/editors/uvedit/CMakeLists.txt b/source/blender/editors/uvedit/CMakeLists.txt index 2355efb3dcb..8973944bdde 100644 --- a/source/blender/editors/uvedit/CMakeLists.txt +++ b/source/blender/editors/uvedit/CMakeLists.txt @@ -4,10 +4,7 @@ set(INC ../include - ../../makesrna ../../../../intern/eigen - # RNA_prototypes.hh - ${CMAKE_BINARY_DIR}/source/blender/makesrna ) set(INC_SYS @@ -40,6 +37,7 @@ set(LIB PRIVATE bf::geometry PRIVATE bf::gpu PRIVATE bf::intern::guardedalloc + PRIVATE bf::rna PRIVATE bf::windowmanager ) @@ -53,5 +51,3 @@ endif() blender_add_lib(bf_editor_uvedit "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") -# RNA_prototypes.hh -add_dependencies(bf_editor_uvedit bf_rna) diff --git a/source/blender/freestyle/CMakeLists.txt b/source/blender/freestyle/CMakeLists.txt index 37d1674c852..80e713f3cc0 100644 --- a/source/blender/freestyle/CMakeLists.txt +++ b/source/blender/freestyle/CMakeLists.txt @@ -542,17 +542,15 @@ set(LIB ${PYTHON_LINKFLAGS} ${PYTHON_LIBRARIES} PRIVATE bf::render + PRIVATE bf::rna ) set(INC . - ../makesrna ../python ../python/intern ../render/intern - # RNA_prototypes.hh - ${CMAKE_BINARY_DIR}/source/blender/makesrna ) set(INC_SYS @@ -582,5 +580,3 @@ if(COMMAND target_precompile_headers) target_precompile_headers(bf_freestyle PRIVATE FRS_precomp.h) endif() -# RNA_prototypes.hh -add_dependencies(bf_freestyle bf_rna) diff --git a/source/blender/geometry/CMakeLists.txt b/source/blender/geometry/CMakeLists.txt index d06d04c07cf..5e9fa6761ef 100644 --- a/source/blender/geometry/CMakeLists.txt +++ b/source/blender/geometry/CMakeLists.txt @@ -4,7 +4,6 @@ set(INC PUBLIC . - ../makesrna ../../../intern/eigen ) @@ -105,6 +104,7 @@ set(LIB PRIVATE bf::intern::atomic PRIVATE bf::intern::guardedalloc PRIVATE bf::extern::fmtlib + PRIVATE bf::rna ) if(WITH_UV_SLIM) diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt index d2f0b80d01e..d6fe53f84d5 100644 --- a/source/blender/gpu/CMakeLists.txt +++ b/source/blender/gpu/CMakeLists.txt @@ -9,7 +9,6 @@ set(INC metal opengl vulkan - ../makesrna # For theme color access. ../editors/include @@ -386,6 +385,7 @@ set(LIB PRIVATE bf::intern::guardedalloc PRIVATE bf::extern::fmtlib PRIVATE bf::nodes + PRIVATE bf::rna ) # Select Backend source based on availability diff --git a/source/blender/imbuf/CMakeLists.txt b/source/blender/imbuf/CMakeLists.txt index 51dff2af223..57128cbf5c4 100644 --- a/source/blender/imbuf/CMakeLists.txt +++ b/source/blender/imbuf/CMakeLists.txt @@ -7,7 +7,6 @@ add_subdirectory(movie) set(INC PUBLIC . ./movie - ../makesrna ../../../intern/memutil ) @@ -81,6 +80,7 @@ set(LIB PRIVATE bf::extern::nanosvg ${JPEG_LIBRARIES} + PRIVATE bf::rna PRIVATE bf::sequencer ) diff --git a/source/blender/io/alembic/CMakeLists.txt b/source/blender/io/alembic/CMakeLists.txt index 0bfe03278a1..2485fc38cf7 100644 --- a/source/blender/io/alembic/CMakeLists.txt +++ b/source/blender/io/alembic/CMakeLists.txt @@ -6,7 +6,6 @@ set(INC . ../common ../../editors/include - ../../makesrna ../../../../intern/utfconv ) @@ -92,6 +91,7 @@ set(LIB ${ALEMBIC_LIBRARIES} ${OPENEXR_LIBRARIES} + PRIVATE bf::rna PRIVATE bf::windowmanager ) diff --git a/source/blender/io/collada/CMakeLists.txt b/source/blender/io/collada/CMakeLists.txt index 147f79a2ffb..9c3e20ef3ac 100644 --- a/source/blender/io/collada/CMakeLists.txt +++ b/source/blender/io/collada/CMakeLists.txt @@ -23,7 +23,6 @@ set(INC . ../../editors/include ../../ikplugin - ../../makesrna ../../../../intern/iksolver/extern ) @@ -117,6 +116,7 @@ set(LIB PRIVATE bf::dna PRIVATE bf::imbuf PRIVATE bf::intern::guardedalloc + PRIVATE bf::rna PRIVATE bf::windowmanager ) diff --git a/source/blender/io/common/CMakeLists.txt b/source/blender/io/common/CMakeLists.txt index bb07d9f510e..f47bca275c3 100644 --- a/source/blender/io/common/CMakeLists.txt +++ b/source/blender/io/common/CMakeLists.txt @@ -4,7 +4,6 @@ set(INC . - ../../makesrna ) set(INC_SYS @@ -37,6 +36,7 @@ set(LIB PRIVATE bf::intern::clog PRIVATE bf::intern::guardedalloc PRIVATE bf::extern::fmtlib + PRIVATE bf::rna ) blender_add_lib(bf_io_common "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/source/blender/io/grease_pencil/CMakeLists.txt b/source/blender/io/grease_pencil/CMakeLists.txt index 0d2be5e38bb..16314e3184d 100644 --- a/source/blender/io/grease_pencil/CMakeLists.txt +++ b/source/blender/io/grease_pencil/CMakeLists.txt @@ -7,7 +7,6 @@ set(INC ../common ../../editors/include ../../makesdna - ../../makesrna ../../../../intern/guardedalloc ../../../../intern/utfconv ../../../../extern/fmtlib/include @@ -36,6 +35,7 @@ set(LIB PRIVATE bf::geometry PRIVATE bf::intern::clog PRIVATE bf::intern::guardedalloc + PRIVATE bf::rna PRIVATE bf::windowmanager PRIVATE extern_fmtlib bf_io_common diff --git a/source/blender/io/ply/CMakeLists.txt b/source/blender/io/ply/CMakeLists.txt index e76b94254d5..d567dcf49a4 100644 --- a/source/blender/io/ply/CMakeLists.txt +++ b/source/blender/io/ply/CMakeLists.txt @@ -8,7 +8,6 @@ set(INC importer intern ../common - ../../makesrna ) set(INC_SYS @@ -56,6 +55,7 @@ set(LIB PRIVATE bf::intern::guardedalloc bf_io_common PRIVATE bf::extern::fmtlib + PRIVATE bf::rna PRIVATE bf::windowmanager ) diff --git a/source/blender/io/stl/CMakeLists.txt b/source/blender/io/stl/CMakeLists.txt index 4ded38a5ed0..5382c017376 100644 --- a/source/blender/io/stl/CMakeLists.txt +++ b/source/blender/io/stl/CMakeLists.txt @@ -9,7 +9,6 @@ set(INC intern ../common ../../editors/include - ../../makesrna ) set(INC_SYS @@ -46,6 +45,7 @@ set(LIB PRIVATE bf::intern::guardedalloc bf_io_common PRIVATE bf::extern::fmtlib + PRIVATE bf::rna PRIVATE bf::windowmanager ) diff --git a/source/blender/io/usd/CMakeLists.txt b/source/blender/io/usd/CMakeLists.txt index 2bf8f7a3925..2782eea5dbe 100644 --- a/source/blender/io/usd/CMakeLists.txt +++ b/source/blender/io/usd/CMakeLists.txt @@ -45,11 +45,8 @@ set(INC . ../common ../../editors/include - ../../makesrna ../../python/intern ../../../../intern/utfconv - # RNA_prototypes.hh - ${CMAKE_BINARY_DIR}/source/blender/makesrna ) set(INC_SYS @@ -202,6 +199,7 @@ set(LIB bf_io_common PRIVATE bf::extern::fmtlib PRIVATE bf::nodes + PRIVATE bf::rna PRIVATE bf::windowmanager ) @@ -233,8 +231,6 @@ endif() blender_add_lib(bf_io_usd "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") -# RNA_prototypes.hh -add_dependencies(bf_io_usd bf_rna) if(COMMAND target_precompile_headers) target_precompile_headers(bf_io_usd PRIVATE intern/usd_precomp.hh) diff --git a/source/blender/io/wavefront_obj/CMakeLists.txt b/source/blender/io/wavefront_obj/CMakeLists.txt index eb32fd90980..1739b49a9f0 100644 --- a/source/blender/io/wavefront_obj/CMakeLists.txt +++ b/source/blender/io/wavefront_obj/CMakeLists.txt @@ -9,7 +9,6 @@ set(INC ../common ../../bmesh/intern ../../editors/include - ../../makesrna ) set(INC_SYS @@ -59,6 +58,7 @@ set(LIB bf_io_common PRIVATE bf::extern::fmtlib PRIVATE bf::nodes + PRIVATE bf::rna PRIVATE bf::windowmanager ) diff --git a/source/blender/makesrna/intern/CMakeLists.txt b/source/blender/makesrna/intern/CMakeLists.txt index bbdc0c66ba1..d751a0b13bb 100644 --- a/source/blender/makesrna/intern/CMakeLists.txt +++ b/source/blender/makesrna/intern/CMakeLists.txt @@ -233,8 +233,10 @@ set(SRC ) set(INC - . - .. + PUBLIC . +# RNA_prototypes.hh + PUBLIC ${CMAKE_CURRENT_BINARY_DIR}/../../makesrna/ + PUBLIC .. ../../animrig ../../asset_system ../../blenfont @@ -265,10 +267,6 @@ set(INC ../../../../extern/fmtlib/include ../../../../intern/memutil ../../../../intern/mantaflow/extern - - - # RNA_prototypes.hh - ${CMAKE_CURRENT_BINARY_DIR}/../../makesrna/ ) set(INC_SYS @@ -507,3 +505,4 @@ set(LIB ) blender_add_lib(bf_rna "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") +add_library(bf::rna ALIAS bf_rna) diff --git a/source/blender/modifiers/CMakeLists.txt b/source/blender/modifiers/CMakeLists.txt index 0f5b1cf5a35..5aeeec3ae82 100644 --- a/source/blender/modifiers/CMakeLists.txt +++ b/source/blender/modifiers/CMakeLists.txt @@ -7,11 +7,8 @@ set(INC intern intern/lineart ../editors/include - ../makesrna ../../../intern/eigen - # RNA_prototypes.hh - ${CMAKE_BINARY_DIR}/source/blender/makesrna ) set(INC_SYS @@ -145,6 +142,7 @@ set(LIB PRIVATE bf::extern::fmtlib PRIVATE bf::nodes PRIVATE bf::render + PRIVATE bf::rna PRIVATE bf::windowmanager ) @@ -244,5 +242,3 @@ endif() blender_add_lib(bf_modifiers "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") -# RNA_prototypes.hh -add_dependencies(bf_modifiers bf_rna) diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt index c8995c74b06..26fbdbc7e86 100644 --- a/source/blender/nodes/CMakeLists.txt +++ b/source/blender/nodes/CMakeLists.txt @@ -56,11 +56,8 @@ set(INC ../animrig ../editors/include ../depsgraph - ../makesrna ../modifiers - # RNA_prototypes.hh - ${CMAKE_BINARY_DIR}/source/blender/makesrna ) set(INC_SYS @@ -151,6 +148,7 @@ set(LIB PRIVATE bf::extern::fmtlib PRIVATE bf::extern::xxhash PRIVATE bf::render + PRIVATE bf::rna PRIVATE bf::windowmanager ) @@ -210,5 +208,3 @@ endif() blender_add_lib(bf_nodes "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") add_library(bf::nodes ALIAS bf_nodes) -# RNA_prototypes.hh -add_dependencies(bf_nodes bf_rna) diff --git a/source/blender/nodes/composite/CMakeLists.txt b/source/blender/nodes/composite/CMakeLists.txt index 9fc626db85b..d0de0eb1ced 100644 --- a/source/blender/nodes/composite/CMakeLists.txt +++ b/source/blender/nodes/composite/CMakeLists.txt @@ -7,14 +7,11 @@ set(INC .. ../intern ../../editors/include - ../../makesrna ../../compositor ../../compositor/algorithms ../../compositor/cached_resources ../../compositor/utilities - # RNA_prototypes.hh - ${CMAKE_BINARY_DIR}/source/blender/makesrna ) set(INC_SYS @@ -132,6 +129,7 @@ set(LIB PRIVATE bf::extern::fmtlib bf_compositor PRIVATE bf::render + PRIVATE bf::rna PRIVATE bf::windowmanager ) @@ -171,5 +169,3 @@ blender_add_lib(bf_nodes_composite "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") blender_set_target_unity_build(bf_nodes_composite 10) -# RNA_prototypes.hh -add_dependencies(bf_nodes_composite bf_rna) diff --git a/source/blender/nodes/function/CMakeLists.txt b/source/blender/nodes/function/CMakeLists.txt index 8dcad99cf2b..e8f4389f64a 100644 --- a/source/blender/nodes/function/CMakeLists.txt +++ b/source/blender/nodes/function/CMakeLists.txt @@ -7,7 +7,6 @@ set(INC .. ../intern ../../editors/include - ../../makesrna ) set(INC_SYS @@ -71,6 +70,7 @@ set(LIB PRIVATE bf::dna PRIVATE bf::functions PRIVATE bf::intern::guardedalloc + PRIVATE bf::rna PRIVATE bf::windowmanager ) diff --git a/source/blender/nodes/geometry/CMakeLists.txt b/source/blender/nodes/geometry/CMakeLists.txt index 7ac704c45fb..680cff0719e 100644 --- a/source/blender/nodes/geometry/CMakeLists.txt +++ b/source/blender/nodes/geometry/CMakeLists.txt @@ -8,14 +8,11 @@ set(INC include ../intern ../../editors/include - ../../makesrna ../../modifiers ../../io/common ../../io/ply ../../io/stl ../../io/wavefront_obj - # RNA_prototypes.hh - ${CMAKE_BINARY_DIR}/source/blender/makesrna ) set(INC_SYS @@ -255,6 +252,7 @@ set(LIB PRIVATE bf::extern::fmtlib PRIVATE bf::extern::xxhash PRIVATE bf::render + PRIVATE bf::rna PRIVATE bf::windowmanager ) @@ -354,5 +352,3 @@ target_link_libraries(bf_nodes_geometry_generated bf_nodes_geometry) blender_set_target_unity_build(bf_nodes_geometry 10) -# RNA_prototypes.hh -add_dependencies(bf_nodes_geometry bf_rna) diff --git a/source/blender/nodes/shader/CMakeLists.txt b/source/blender/nodes/shader/CMakeLists.txt index 0ab471a631b..8125103c9ac 100644 --- a/source/blender/nodes/shader/CMakeLists.txt +++ b/source/blender/nodes/shader/CMakeLists.txt @@ -7,10 +7,7 @@ set(INC .. ../intern ../../editors/include - ../../makesrna ../../../../intern/sky/include - # RNA_prototypes.hh - ${CMAKE_BINARY_DIR}/source/blender/makesrna ) set(INC_SYS @@ -135,6 +132,7 @@ set(LIB bf_intern_sky bf_nodes PRIVATE bf::render + PRIVATE bf::rna PRIVATE bf::windowmanager ) @@ -181,5 +179,3 @@ blender_add_lib(bf_nodes_shader "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") blender_set_target_unity_build(bf_nodes_shader 10) -# RNA_prototypes.hh -add_dependencies(bf_nodes_shader bf_rna) diff --git a/source/blender/nodes/texture/CMakeLists.txt b/source/blender/nodes/texture/CMakeLists.txt index c33ae17f1d9..0844403fe2d 100644 --- a/source/blender/nodes/texture/CMakeLists.txt +++ b/source/blender/nodes/texture/CMakeLists.txt @@ -7,9 +7,6 @@ set(INC .. ../intern ../../editors/include - ../../makesrna - # RNA_prototypes.hh - ${CMAKE_BINARY_DIR}/source/blender/makesrna ) set(INC_SYS @@ -61,10 +58,9 @@ set(LIB PRIVATE bf::intern::guardedalloc bf_nodes PRIVATE bf::render + PRIVATE bf::rna PRIVATE bf::windowmanager ) blender_add_lib(bf_nodes_texture "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") -# RNA_prototypes.hh -add_dependencies(bf_nodes_texture bf_rna) diff --git a/source/blender/python/generic/CMakeLists.txt b/source/blender/python/generic/CMakeLists.txt index 3bda729a572..e7bf9f958a3 100644 --- a/source/blender/python/generic/CMakeLists.txt +++ b/source/blender/python/generic/CMakeLists.txt @@ -4,7 +4,6 @@ set(INC . - ../../makesrna ) set(INC_SYS @@ -45,6 +44,7 @@ set(LIB PRIVATE bf::gpu PRIVATE bf::intern::clog PRIVATE bf::intern::guardedalloc + PRIVATE bf::rna ) # NOTE: use irrespective of `WITH_OPENGL_BACKEND` as the `bgl` module uses this for constants. diff --git a/source/blender/python/intern/CMakeLists.txt b/source/blender/python/intern/CMakeLists.txt index c74c0d45bbd..d599b72b51c 100644 --- a/source/blender/python/intern/CMakeLists.txt +++ b/source/blender/python/intern/CMakeLists.txt @@ -6,11 +6,8 @@ set(INC .. ../../editors/include ../../imbuf/intern/oiio - ../../makesrna ../../../../intern/mantaflow/extern ../../../../intern/opencolorio - # RNA_prototypes.hh - ${CMAKE_BINARY_DIR}/source/blender/makesrna ) set(INC_SYS @@ -132,6 +129,7 @@ set(LIB ${PYTHON_LINKFLAGS} ${PYTHON_LIBRARIES} + PRIVATE bf::rna PRIVATE bf::windowmanager ) @@ -376,5 +374,3 @@ endif() blender_add_lib(bf_python "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") -# RNA_prototypes.hh -add_dependencies(bf_python bf_rna) diff --git a/source/blender/render/CMakeLists.txt b/source/blender/render/CMakeLists.txt index c0366bcba36..d2c65a0384c 100644 --- a/source/blender/render/CMakeLists.txt +++ b/source/blender/render/CMakeLists.txt @@ -10,7 +10,6 @@ set(INC ../compositor/cached_resources ../draw/intern ../gpu/intern - ../makesrna ../simulation ../../../intern/mikktspace ../../../intern/mantaflow/extern @@ -66,6 +65,7 @@ set(LIB bf_compositor PRIVATE bf::intern::atomic PRIVATE bf::nodes + PRIVATE bf::rna PRIVATE bf::sequencer PRIVATE bf::windowmanager ) diff --git a/source/blender/render/hydra/CMakeLists.txt b/source/blender/render/hydra/CMakeLists.txt index d1c4ccc85eb..91f3441ded1 100644 --- a/source/blender/render/hydra/CMakeLists.txt +++ b/source/blender/render/hydra/CMakeLists.txt @@ -45,12 +45,9 @@ set(INC ../../../../intern/guardedalloc ../../blenlib ../../makesdna - ../../makesrna ../../io/usd ../../gpu/intern ../../python/intern - # RNA_prototypes.hh - ${CMAKE_BINARY_DIR}/source/blender/makesrna .. ) @@ -77,6 +74,7 @@ set(LIB PRIVATE bf::intern::clog bf_io_usd PRIVATE bf::nodes + PRIVATE bf::rna ) set(SRC @@ -101,5 +99,3 @@ set(SRC blender_add_lib(bf_render_hydra "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") -# RNA_prototypes.hh -add_dependencies(bf_render_hydra bf_rna) diff --git a/source/blender/sequencer/CMakeLists.txt b/source/blender/sequencer/CMakeLists.txt index 6373f0dc9aa..494e3eddc3e 100644 --- a/source/blender/sequencer/CMakeLists.txt +++ b/source/blender/sequencer/CMakeLists.txt @@ -6,10 +6,7 @@ set(INC PUBLIC . intern ../animrig - ../makesrna - # RNA_prototypes.hh - ${CMAKE_BINARY_DIR}/source/blender/makesrna ) set(INC_SYS @@ -102,6 +99,7 @@ set(LIB PRIVATE bf::intern::clog PRIVATE bf::intern::guardedalloc PRIVATE bf::render + PRIVATE bf::rna PRIVATE bf::windowmanager ) @@ -125,5 +123,3 @@ endif() blender_add_lib(bf_sequencer "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") add_library(bf::sequencer ALIAS bf_sequencer) -# RNA_prototypes.hh -add_dependencies(bf_sequencer bf_rna) diff --git a/source/blender/shader_fx/CMakeLists.txt b/source/blender/shader_fx/CMakeLists.txt index 15924c9cad4..9518a9bc1b2 100644 --- a/source/blender/shader_fx/CMakeLists.txt +++ b/source/blender/shader_fx/CMakeLists.txt @@ -6,10 +6,7 @@ set(INC . intern ../editors/include - ../makesrna ../../../intern/eigen - # RNA_prototypes.hh - ${CMAKE_BINARY_DIR}/source/blender/makesrna ) set(INC_SYS @@ -45,11 +42,10 @@ set(LIB PRIVATE bf::dna PRIVATE bf::intern::guardedalloc PRIVATE bf::render + PRIVATE bf::rna PRIVATE bf::windowmanager ) blender_add_lib(bf_shader_fx "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") -# RNA_prototypes.hh -add_dependencies(bf_shader_fx bf_rna) diff --git a/source/blender/simulation/CMakeLists.txt b/source/blender/simulation/CMakeLists.txt index 7ec4d4d3512..d61b3734843 100644 --- a/source/blender/simulation/CMakeLists.txt +++ b/source/blender/simulation/CMakeLists.txt @@ -5,7 +5,6 @@ set(INC . intern - ../makesrna ) set(INC_SYS @@ -34,6 +33,7 @@ set(LIB PRIVATE bf::imbuf PRIVATE bf::intern::guardedalloc PRIVATE bf::nodes + PRIVATE bf::rna ) diff --git a/source/blender/windowmanager/CMakeLists.txt b/source/blender/windowmanager/CMakeLists.txt index 0af626db003..251dc222630 100644 --- a/source/blender/windowmanager/CMakeLists.txt +++ b/source/blender/windowmanager/CMakeLists.txt @@ -8,11 +8,8 @@ set(INC gizmo/intern ../compositor ../editors/include - ../makesrna ../../../intern/memutil - # RNA_prototypes.hh - ${CMAKE_BINARY_DIR}/source/blender/makesrna ) set(INC_SYS ) @@ -106,6 +103,7 @@ set(LIB PRIVATE bf::animrig PRIVATE bf::nodes PRIVATE bf::render + PRIVATE bf::rna PRIVATE bf::sequencer bf_intern_ghost bf_compositor @@ -205,8 +203,6 @@ endif() blender_add_lib_nolist(bf_windowmanager "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") add_library(bf::windowmanager ALIAS bf_windowmanager) -# RNA_prototypes.hh -add_dependencies(bf_windowmanager bf_rna) if(WITH_GTESTS) set(TEST_INC diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 56776164814..74c7dce27be 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -5,7 +5,6 @@ set(INC ../blender/editors/include ../blender/io/usd - ../blender/makesrna ) set(LIB @@ -20,6 +19,7 @@ set(LIB PRIVATE bf::intern::clog PRIVATE bf::intern::guardedalloc PRIVATE bf::render + PRIVATE bf::rna PRIVATE bf::windowmanager )