Cleanup: CMake: Modernize bf_dna dependencies

There's quite a few libraries that depend on dna_type_offsets.h but had gotten to it by just adding the folder that contains it to their includes INC section without declaring a dependency to bf_dna in the LIB section. which occasionally lead to the lib building before bf_dna and the header being missing, while this generally gets fixed in CMake by adding bf_dna to the LIB section of the lib, however until last week all libraries in the LIB section were linked as INTERFACE so adding it in there did not resolve the build issue. To make things still build, we sprinkled add_dependencies wherever we needed it to force a build order. This diff : Declares public include folders for the bf_dna target so there's no more fudging the INC section required to get to them. Removes all dna related paths from the INC section for all libraries. Adds an alias target bf:dna to signify it has been updated to modern cmake Declares a dependency on bf::dna for all libraries that require it Removes (almost) all calls to add_dependencies for bf_dna Future work: Because of the manual dependency management that was done, there is now some "clutter" with libs depending on bf_dna that realistically don't. Example bf_intern_opencolorio itself has no dependency on bf_dna at all, doesn't need it, doesn't use it. However the dna include folder had been added to it in the past since bf_blenlib uses dna headers in some of its public headers and bf_intern_opencolorio does use those blenlib headers. Given bf_blenlib now correctly declares the dependency on bf_dna as public bf_intern_opencolorio will get the dna header directory automatically from CMake, hence some cleanup could be done for bf_intern_opencolorio Because 99% of the changes in this diff have been automated, this diff does not seek to address these issues as there is no easy way to determine why a certain dependency is in place. A developer will have to make a pass a this at some later point in time. As I'd rather not mix automated and manual labour. There are a few libraries that could not be automatically processed (ie bf_blendthumb) that also will need this manual look-over. Pull Request: https://projects.blender.org/blender/blender/pulls/109835
2023-07-10 15:07:37 +02:00
parent 37d1d4cb07
commit 7cebb61486
101 changed files with 104 additions and 208 deletions
--- a/intern/cycles/blender/CMakeLists.txt
+++ b/intern/cycles/blender/CMakeLists.txt
@@ -6,7 +6,6 @@ set(INC
  ..
  ../../guardedalloc
  ../../mikktspace
-  ../../../source/blender/makesdna
  ../../../source/blender/makesrna
  ../../../source/blender/blenkernel
  ../../../source/blender/blenlib
@@ -60,6 +59,7 @@ set(SRC
 )

 set(LIB
+  PRIVATE bf::dna
  cycles_bvh
  cycles_device
  cycles_graph
--- a/intern/ghost/CMakeLists.txt
+++ b/intern/ghost/CMakeLists.txt
@@ -7,7 +7,6 @@ set(INC
  ../clog
  ../../source/blender/blenlib
  ../../source/blender/imbuf
-  ../../source/blender/makesdna
 )

 set(INC_SYS
@@ -75,6 +74,7 @@ set(SRC

 set(LIB
  ${Epoxy_LIBRARIES}
+  PRIVATE bf::dna
 )

 if(WITH_VULKAN_BACKEND)
--- a/intern/mantaflow/CMakeLists.txt
+++ b/intern/mantaflow/CMakeLists.txt
@@ -25,7 +25,6 @@ endif()
 set(INC
  extern
  intern/strings
-  ../../source/blender/makesdna
  ../../source/blender/blenlib
 )

@@ -74,6 +73,7 @@ set(SRC
 )

 set(LIB
+  PRIVATE bf::dna
  extern_mantaflow

  ${PYTHON_LINKFLAGS}
--- a/intern/opencolorio/CMakeLists.txt
+++ b/intern/opencolorio/CMakeLists.txt
@@ -8,7 +8,6 @@ set(INC
  ../../source/blender/blenlib
  ../../source/blender/gpu
  ../../source/blender/gpu/intern
-  ../../source/blender/makesdna
 )

 set(INC_SYS
@@ -25,6 +24,7 @@ set(SRC
 )

 set(LIB
+  PRIVATE bf::dna
 )

 if(WITH_OPENCOLORIO)
--- a/source/blender/asset_system/CMakeLists.txt
+++ b/source/blender/asset_system/CMakeLists.txt
@@ -7,7 +7,6 @@ set(INC
  intern
  ../blenkernel
  ../blenlib
-  ../makesdna
  ../../../intern/clog
  ../../../intern/guardedalloc
 )
@@ -43,6 +42,7 @@ set(SRC

 set(LIB
  bf_blenkernel
+  PRIVATE bf::dna
 )


--- a/source/blender/blenfont/CMakeLists.txt
+++ b/source/blender/blenfont/CMakeLists.txt
@@ -9,7 +9,6 @@ set(INC
  ../blentranslation
  ../gpu
  ../imbuf
-  ../makesdna
  ../makesrna
  ../../../intern/guardedalloc
 )
@@ -34,6 +33,7 @@ set(SRC
 )

 set(LIB
+  PRIVATE bf::dna
  bf_gpu
  bf_intern_guardedalloc

--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -17,7 +17,6 @@ set(INC
  ../gpu
  ../ikplugin
  ../imbuf
-  ../makesdna
  ../makesrna
  ../modifiers
  ../nodes
@@ -38,8 +37,6 @@ set(INC
  ../../../extern/curve_fit_nd
  ../../../extern/fmtlib/include

-  # dna_type_offsets.h
-  ${CMAKE_CURRENT_BINARY_DIR}/../makesdna/intern
  # RNA_prototypes.h
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
@@ -539,6 +536,7 @@ set(LIB
  bf_blentranslation
  bf_bmesh
  bf_depsgraph
+  PRIVATE bf::dna
  bf_draw
  bf_functions
  bf_gpencil_modifiers_legacy
@@ -819,8 +817,6 @@ endif()

 blender_add_lib(bf_blenkernel "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

-# Needed so we can use dna_type_offsets.h for defaults initialization.
-add_dependencies(bf_blenkernel bf_dna)
 # RNA_prototypes.h
 add_dependencies(bf_blenkernel bf_rna)

--- a/source/blender/blenlib/CMakeLists.txt
+++ b/source/blender/blenlib/CMakeLists.txt
@@ -9,8 +9,6 @@ endif()
 set(INC
  .
  ..
-  # ../blenkernel  # don't add this back!
-  ../makesdna
  ../../../intern/eigen
  ../../../intern/guardedalloc
 )
@@ -390,6 +388,7 @@ set(SRC
 )

 set(LIB
+  PUBLIC bf::dna
  bf_intern_eigen
  bf_intern_guardedalloc
  extern_wcwidth
--- a/source/blender/blenlib/tests/performance/CMakeLists.txt
+++ b/source/blender/blenlib/tests/performance/CMakeLists.txt
@@ -6,7 +6,6 @@ set(INC
  .
  ..
  ../..
-  ../../../makesdna
  ../../../../../intern/guardedalloc
 )

@@ -15,6 +14,7 @@ set(INC_SYS

 set(LIB
  PRIVATE bf_blenlib
+  PRIVATE bf::dna
  PRIVATE bf_intern_guardedalloc
  PRIVATE bf::intern::atomic
 )
--- a/source/blender/blenloader/CMakeLists.txt
+++ b/source/blender/blenloader/CMakeLists.txt
@@ -13,7 +13,6 @@ set(INC
  ../editors/include
  ../gpu
  ../imbuf
-  ../makesdna
  ../makesrna
  ../nodes
  ../render
@@ -23,8 +22,6 @@ set(INC
  ../../../intern/guardedalloc
  ../bmesh

-  # for writefile.c: dna_type_offsets.h
-  ${CMAKE_BINARY_DIR}/source/blender/makesdna/intern
  # RNA_prototypes.h
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
@@ -67,6 +64,7 @@ set(SRC
 set(LIB
  bf_blenkernel
  bf_blenlib
+  PRIVATE bf::dna
 )

 if(WITH_BUILDINFO)
@@ -97,8 +95,6 @@ endif()

 blender_add_lib(bf_blenloader "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

-# needed so writefile.c can use dna_type_offsets.h
-add_dependencies(bf_blenloader bf_dna)
 # RNA_prototypes.h
 add_dependencies(bf_blenloader bf_rna)

--- a/source/blender/blentranslation/CMakeLists.txt
+++ b/source/blender/blentranslation/CMakeLists.txt
@@ -7,7 +7,6 @@ set(INC
  ../blenkernel
  ../blenlib
  ../imbuf
-  ../makesdna
  ../makesrna
  ../../../intern/guardedalloc
  ../../../intern/locale
@@ -27,6 +26,7 @@ set(SRC
 set(LIB
  bf_blenkernel
  bf_blenlib
+  PRIVATE bf::dna
 )

 if(WITH_INTERNATIONAL)
--- a/source/blender/bmesh/CMakeLists.txt
+++ b/source/blender/bmesh/CMakeLists.txt
@@ -8,7 +8,6 @@ set(INC
  ../blenlib
  ../blentranslation
  ../depsgraph
-  ../makesdna
  ../../../intern/clog
  ../../../intern/eigen
  ../../../intern/guardedalloc
@@ -171,6 +170,7 @@ set(SRC
 set(LIB
  bf_blenkernel
  bf_blenlib
+  PRIVATE bf::dna
  extern_rangetree
  PRIVATE bf::intern::atomic
 )
--- a/source/blender/compositor/CMakeLists.txt
+++ b/source/blender/compositor/CMakeLists.txt
@@ -15,7 +15,6 @@ if(WITH_COMPOSITOR_CPU)
    ../blentranslation
    ../depsgraph
    ../imbuf
-    ../makesdna
    ../makesrna
    ../nodes
    ../windowmanager
@@ -27,8 +26,6 @@ if(WITH_COMPOSITOR_CPU)
    ../../../intern/clog
    ../../../intern/guardedalloc

-    # dna_type_offsets.h
-    ${CMAKE_CURRENT_BINARY_DIR}/../makesdna/intern
    # RNA_prototypes.h
    ${CMAKE_BINARY_DIR}/source/blender/makesrna
  )
@@ -601,6 +598,7 @@ if(WITH_COMPOSITOR_CPU)
  set(LIB
    bf_blenkernel
    bf_blenlib
+    PRIVATE bf::dna
    extern_clew
    PRIVATE bf::intern::atomic
  )
@@ -675,8 +673,6 @@ if(WITH_COMPOSITOR_CPU)
    blender_add_test_lib(bf_compositor_tests "${TEST_SRC}" "${INC};${TEST_INC}" "${INC_SYS}" "${LIB};${TEST_LIB}")
  endif()

-  # Needed so we can use dna_type_offsets.h for defaults initialization.
-  add_dependencies(bf_compositor bf_dna)
  # RNA_prototypes.h
  add_dependencies(bf_compositor bf_rna)

--- a/source/blender/compositor/realtime_compositor/CMakeLists.txt
+++ b/source/blender/compositor/realtime_compositor/CMakeLists.txt
@@ -12,15 +12,12 @@ set(INC
  ../../draw
  ../../gpu
  ../../imbuf
-  ../../makesdna
  ../../makesrna
  ../../nodes
  ../../render
  ../../gpu/intern
  ../../../../intern/guardedalloc

-  # dna_type_offsets.h
-  ${CMAKE_CURRENT_BINARY_DIR}/../../makesdna/intern
 )

 set(INC_SYS
@@ -101,6 +98,7 @@ set(SRC
 )

 set(LIB
+  PRIVATE bf::dna
  bf_gpu
  bf_nodes
  bf_imbuf
@@ -311,5 +309,3 @@ endif()

 blender_add_lib(bf_realtime_compositor "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

-# Needed so we can use dna_type_offsets.h
-add_dependencies(bf_realtime_compositor bf_dna)
--- a/source/blender/depsgraph/CMakeLists.txt
+++ b/source/blender/depsgraph/CMakeLists.txt
@@ -9,7 +9,6 @@ set(INC
  ../bmesh
  ../draw
  ../functions
-  ../makesdna
  ../makesrna
  ../modifiers
  ../sequencer
@@ -155,6 +154,7 @@ set(SRC

 set(LIB
  bf_blenkernel
+  PRIVATE bf::dna
  PRIVATE bf::intern::atomic
 )

--- a/source/blender/draw/CMakeLists.txt
+++ b/source/blender/draw/CMakeLists.txt
@@ -19,7 +19,6 @@ set(INC
  ../gpu
  ../gpu/intern
  ../imbuf
-  ../makesdna
  ../makesrna
  ../nodes
  ../render
@@ -33,8 +32,6 @@ set(INC
  ../../../intern/guardedalloc
  ../../../intern/opensubdiv

-  # dna_type_offsets.h
-  ${CMAKE_CURRENT_BINARY_DIR}/../makesdna/intern
 )

 set(SRC
@@ -359,6 +356,7 @@ set(SRC
 set(LIB
  bf_blenkernel
  bf_blenlib
+  PRIVATE bf::dna
  bf_realtime_compositor
  bf_windowmanager
  PRIVATE bf::intern::atomic
@@ -890,8 +888,6 @@ endif()

 blender_add_lib(bf_draw "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

-# Needed so we can use dna_type_offsets.h for defaults initialization.
-add_dependencies(bf_draw bf_dna)

 if(WITH_GTESTS)
  if(WITH_OPENGL_DRAW_TESTS)
--- a/source/blender/editors/animation/CMakeLists.txt
+++ b/source/blender/editors/animation/CMakeLists.txt
@@ -9,7 +9,6 @@ set(INC
  ../../blentranslation
  ../../depsgraph
  ../../gpu
-  ../../makesdna
  ../../makesrna
  ../../sequencer
  ../../windowmanager
@@ -48,6 +47,7 @@ set(SRC
 set(LIB
  bf_blenkernel
  bf_blenlib
+  PRIVATE bf::dna
 )

 if(WITH_PYTHON)
--- a/source/blender/editors/armature/CMakeLists.txt
+++ b/source/blender/editors/armature/CMakeLists.txt
@@ -12,7 +12,6 @@ set(INC
  ../../blentranslation
  ../../depsgraph
  ../../gpu
-  ../../makesdna
  ../../makesrna
  ../../windowmanager
  ../../../../intern/clog
@@ -51,6 +50,7 @@ set(SRC
 set(LIB
  bf_blenkernel
  bf_blenlib
+  PRIVATE bf::dna
 )


--- a/source/blender/editors/asset/CMakeLists.txt
+++ b/source/blender/editors/asset/CMakeLists.txt
@@ -10,7 +10,6 @@ set(INC
  ../../blenlib
  ../../blenloader
  ../../blentranslation
-  ../../makesdna
  ../../makesrna
  ../../windowmanager
  ../../../../intern/clog
@@ -54,6 +53,7 @@ set(SRC
 set(LIB
  bf_blenkernel
  bf_blenloader
+  PRIVATE bf::dna
 )

 blender_add_lib(bf_editor_asset "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
--- a/source/blender/editors/curve/CMakeLists.txt
+++ b/source/blender/editors/curve/CMakeLists.txt
@@ -9,7 +9,6 @@ set(INC
  ../../blentranslation
  ../../depsgraph
  ../../gpu
-  ../../makesdna
  ../../makesrna
  ../../windowmanager
  ../../../../intern/clog
@@ -40,6 +39,7 @@ set(SRC
 set(LIB
  bf_blenkernel
  bf_blenlib
+  PRIVATE bf::dna
  extern_curve_fit_nd
 )

--- a/source/blender/editors/curves/CMakeLists.txt
+++ b/source/blender/editors/curves/CMakeLists.txt
@@ -11,7 +11,6 @@ set(INC
  ../../functions
  ../../geometry
  ../../gpu
-  ../../makesdna
  ../../makesrna
  ../../windowmanager
  ../../../../intern/clog
@@ -35,6 +34,7 @@ set(SRC
 set(LIB
  bf_blenkernel
  bf_blenlib
+  PRIVATE bf::dna
 )

 if(WITH_TBB)
--- a/source/blender/editors/geometry/CMakeLists.txt
+++ b/source/blender/editors/geometry/CMakeLists.txt
@@ -10,7 +10,6 @@ set(INC
  ../../blentranslation
  ../../depsgraph
  ../../functions
-  ../../makesdna
  ../../makesrna
  ../../nodes
  ../../windowmanager
@@ -35,6 +34,7 @@ set(SRC
 set(LIB
  bf_blenkernel
  bf_depsgraph
+  PRIVATE bf::dna
  bf_editor_object
  bf_windowmanager
 )
--- a/source/blender/editors/gizmo_library/CMakeLists.txt
+++ b/source/blender/editors/gizmo_library/CMakeLists.txt
@@ -10,7 +10,6 @@ set(INC
  ../../bmesh
  ../../depsgraph
  ../../gpu
-  ../../makesdna
  ../../makesrna
  ../../windowmanager
  ../../../../intern/clog
@@ -44,6 +43,7 @@ set(SRC
 )

 set(LIB
+  PRIVATE bf::dna
 )


--- a/source/blender/editors/gpencil_legacy/CMakeLists.txt
+++ b/source/blender/editors/gpencil_legacy/CMakeLists.txt
@@ -11,7 +11,6 @@ set(INC
  ../../depsgraph
  ../../gpu
  ../../imbuf
-  ../../makesdna
  ../../makesrna
  ../../windowmanager
  ../../../../intern/guardedalloc
@@ -62,6 +61,7 @@ set(SRC
 set(LIB
  bf_blenkernel
  bf_blenlib
+  PRIVATE bf::dna
 )

 if(WITH_POTRACE)
--- a/source/blender/editors/grease_pencil/CMakeLists.txt
+++ b/source/blender/editors/grease_pencil/CMakeLists.txt
@@ -10,7 +10,6 @@ set(INC
  ../../depsgraph
  ../../gpu
  ../../imbuf
-  ../../makesdna
  ../../makesrna
  ../../windowmanager
  ../../../../intern/guardedalloc
@@ -33,6 +32,7 @@ set(SRC
 set(LIB
  bf_blenkernel
  bf_blenlib
+  PRIVATE bf::dna
 )

 blender_add_lib(bf_editor_grease_pencil "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
--- a/source/blender/editors/interface/CMakeLists.txt
+++ b/source/blender/editors/interface/CMakeLists.txt
@@ -16,7 +16,6 @@ set(INC
  ../../functions
  ../../gpu
  ../../imbuf
-  ../../makesdna
  ../../makesrna
  ../../nodes
  ../../python
@@ -99,6 +98,7 @@ set(SRC
 set(LIB
  bf_blenkernel
  bf_blenlib
+  PRIVATE bf::dna
  bf_editor_datafiles
 )

--- a/source/blender/editors/io/CMakeLists.txt
+++ b/source/blender/editors/io/CMakeLists.txt
@@ -17,7 +17,6 @@ set(INC
  ../../io/stl
  ../../io/usd
  ../../io/wavefront_obj
-  ../../makesdna
  ../../makesrna
  ../../windowmanager
  ../../../../intern/guardedalloc
@@ -54,6 +53,7 @@ set(SRC
 set(LIB
  bf_blenkernel
  bf_blenlib
+  PRIVATE bf::dna
 )

 if(WITH_OPENCOLLADA)
--- a/source/blender/editors/lattice/CMakeLists.txt
+++ b/source/blender/editors/lattice/CMakeLists.txt
@@ -7,7 +7,6 @@ set(INC
  ../../blenkernel
  ../../blenlib
  ../../depsgraph
-  ../../makesdna
  ../../makesrna
  ../../render
  ../../windowmanager
@@ -29,6 +28,7 @@ set(SRC
 )

 set(LIB
+  PRIVATE bf::dna
 )

 blender_add_lib(bf_editor_lattice "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
--- a/source/blender/editors/mask/CMakeLists.txt
+++ b/source/blender/editors/mask/CMakeLists.txt
@@ -8,7 +8,6 @@ set(INC
  ../../blenlib
  ../../depsgraph
  ../../gpu
-  ../../makesdna
  ../../makesrna
  ../../windowmanager
  ../../../../intern/guardedalloc
@@ -32,6 +31,7 @@ set(SRC
 )

 set(LIB
+  PRIVATE bf::dna
 )


--- a/source/blender/editors/mesh/CMakeLists.txt
+++ b/source/blender/editors/mesh/CMakeLists.txt
@@ -16,7 +16,6 @@ set(INC
  ../../geometry
  ../../gpu
  ../../imbuf
-  ../../makesdna
  ../../makesrna
  ../../render
  ../../windowmanager
@@ -66,6 +65,7 @@ set(SRC
 set(LIB
  bf_blenkernel
  bf_blenlib
+  PRIVATE bf::dna
  bf_windowmanager
 )

--- a/source/blender/editors/metaball/CMakeLists.txt
+++ b/source/blender/editors/metaball/CMakeLists.txt
@@ -8,7 +8,6 @@ set(INC
  ../../blenlib
  ../../depsgraph
  ../../gpu
-  ../../makesdna
  ../../makesrna
  ../../render
  ../../windowmanager
@@ -29,6 +28,7 @@ set(SRC
 )

 set(LIB
+  PRIVATE bf::dna
 )

 blender_add_lib(bf_editor_metaball "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
--- a/source/blender/editors/object/CMakeLists.txt
+++ b/source/blender/editors/object/CMakeLists.txt
@@ -15,7 +15,6 @@ set(INC
  ../../gpu
  ../../ikplugin
  ../../imbuf
-  ../../makesdna
  ../../makesrna
  ../../modifiers
  ../../python
@@ -25,8 +24,6 @@ set(INC
  ../../../../intern/clog
  ../../../../intern/guardedalloc

-  # dna_type_offsets.h in BLO_read_write.h
-  ${CMAKE_BINARY_DIR}/source/blender/makesdna/intern
  # RNA_prototypes.h
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
@@ -68,6 +65,7 @@ set(SRC
 set(LIB
  bf_blenkernel
  bf_blenlib
+  PRIVATE bf::dna
  bf_editor_mesh
  bf_editor_grease_pencil
  bf_render
@@ -87,6 +85,5 @@ endif()

 blender_add_lib(bf_editor_object "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

-add_dependencies(bf_editor_object bf_dna)
 # RNA_prototypes.h
 add_dependencies(bf_editor_object bf_rna)
--- a/source/blender/editors/physics/CMakeLists.txt
+++ b/source/blender/editors/physics/CMakeLists.txt
@@ -9,7 +9,6 @@ set(INC
  ../../blentranslation
  ../../depsgraph
  ../../gpu
-  ../../makesdna
  ../../makesrna
  ../../windowmanager
  ../../../../intern/clog
@@ -42,6 +41,7 @@ set(SRC
 set(LIB
  bf_blenkernel
  bf_blenlib
+  PRIVATE bf::dna
 )

 if(WITH_MOD_FLUID)
--- a/source/blender/editors/render/CMakeLists.txt
+++ b/source/blender/editors/render/CMakeLists.txt
@@ -13,7 +13,6 @@ set(INC
  ../../draw
  ../../gpu
  ../../imbuf
-  ../../makesdna
  ../../makesrna
  ../../nodes
  ../../render
@@ -37,6 +36,7 @@ set(SRC
 )

 set(LIB
+  PRIVATE bf::dna
  bf_draw
 )

--- a/source/blender/editors/scene/CMakeLists.txt
+++ b/source/blender/editors/scene/CMakeLists.txt
@@ -8,7 +8,6 @@ set(INC
  ../../blenlib
  ../../blentranslation
  ../../depsgraph
-  ../../makesdna
  ../../makesrna
  ../../sequencer
  ../../windowmanager
@@ -26,6 +25,7 @@ set(SRC
 set(LIB
  bf_blenkernel
  bf_blenlib
+  PRIVATE bf::dna
 )


--- a/source/blender/editors/screen/CMakeLists.txt
+++ b/source/blender/editors/screen/CMakeLists.txt
@@ -13,7 +13,6 @@ set(INC
  ../../depsgraph
  ../../gpu
  ../../imbuf
-  ../../makesdna
  ../../makesrna
  ../../sequencer
  ../../windowmanager
@@ -45,6 +44,7 @@ set(SRC
 )

 set(LIB
+  PRIVATE bf::dna
  bf_editor_datafiles
  bf_editor_space_sequencer
 )
--- a/source/blender/editors/sculpt_paint/CMakeLists.txt
+++ b/source/blender/editors/sculpt_paint/CMakeLists.txt
@@ -15,7 +15,6 @@ set(INC
  ../../geometry
  ../../gpu
  ../../imbuf
-  ../../makesdna
  ../../makesrna
  ../../nodes
  ../../render
@@ -97,6 +96,7 @@ set(SRC
 set(LIB
  bf_blenkernel
  bf_blenlib
+  PRIVATE bf::dna
  PRIVATE bf::intern::atomic
 )

--- a/source/blender/editors/sound/CMakeLists.txt
+++ b/source/blender/editors/sound/CMakeLists.txt
@@ -7,7 +7,6 @@ set(INC
  ../../blenkernel
  ../../blenlib
  ../../depsgraph
-  ../../makesdna
  ../../makesrna
  ../../sequencer
  ../../windowmanager
@@ -29,6 +28,7 @@ set(SRC
 set(LIB
  bf_blenkernel
  bf_blenlib
+  PRIVATE bf::dna
 )

 if(WITH_AUDASPACE)
--- a/source/blender/editors/space_action/CMakeLists.txt
+++ b/source/blender/editors/space_action/CMakeLists.txt
@@ -10,13 +10,10 @@ set(INC
  ../../blentranslation
  ../../depsgraph
  ../../gpu
-  ../../makesdna
  ../../makesrna
  ../../windowmanager
  ../../../../intern/guardedalloc

-  # dna_type_offsets.h
-  ${CMAKE_CURRENT_BINARY_DIR}/../../makesdna/intern
  # RNA_prototypes.h
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
@@ -39,6 +36,7 @@ set(SRC
 set(LIB
  bf_blenkernel
  bf_blenlib
+  PRIVATE bf::dna
 )


--- a/source/blender/editors/space_api/CMakeLists.txt
+++ b/source/blender/editors/space_api/CMakeLists.txt
@@ -9,7 +9,6 @@ set(INC
  ../../blenkernel
  ../../blenlib
  ../../gpu
-  ../../makesdna
  ../../makesrna
  ../../windowmanager
  ../../../../intern/guardedalloc
@@ -24,6 +23,7 @@ set(SRC
 )

 set(LIB
+  PRIVATE bf::dna
  bf_editor_geometry
  bf_editor_space_action
  bf_editor_space_buttons
--- a/source/blender/editors/space_buttons/CMakeLists.txt
+++ b/source/blender/editors/space_buttons/CMakeLists.txt
@@ -9,14 +9,11 @@ set(INC
  ../../blenloader
  ../../blentranslation
  ../../gpu
-  ../../makesdna
  ../../makesrna
  ../../windowmanager
  ../../../../intern/guardedalloc
  ../../bmesh

-  # dna_type_offsets.h
-  ${CMAKE_CURRENT_BINARY_DIR}/../../makesdna/intern
  # RNA_prototypes.h
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
@@ -34,6 +31,7 @@ set(SRC
 )

 set(LIB
+  PRIVATE bf::dna
 )


--- a/source/blender/editors/space_clip/CMakeLists.txt
+++ b/source/blender/editors/space_clip/CMakeLists.txt
@@ -12,13 +12,10 @@ set(INC
  ../../depsgraph
  ../../gpu
  ../../imbuf
-  ../../makesdna
  ../../makesrna
  ../../windowmanager
  ../../../../intern/guardedalloc

-  # dna_type_offsets.h
-  ${CMAKE_CURRENT_BINARY_DIR}/../../makesdna/intern
  # RNA_prototypes.h
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
@@ -54,12 +51,11 @@ set(SRC
 set(LIB
  bf_blenkernel
  bf_blenlib
+  PRIVATE bf::dna
 )


 blender_add_lib(bf_editor_space_clip "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

-# Needed so we can use dna_type_offsets.h for defaults initialization.
-add_dependencies(bf_editor_space_clip bf_dna)
 # RNA_prototypes.h
 add_dependencies(bf_editor_space_clip bf_rna)
--- a/source/blender/editors/space_console/CMakeLists.txt
+++ b/source/blender/editors/space_console/CMakeLists.txt
@@ -9,13 +9,10 @@ set(INC
  ../../blenlib
  ../../blenloader
  ../../gpu
-  ../../makesdna
  ../../makesrna
  ../../windowmanager
  ../../../../intern/guardedalloc

-  # dna_type_offsets.h
-  ${CMAKE_CURRENT_BINARY_DIR}/../../makesdna/intern
 )

 set(INC_SYS
@@ -32,6 +29,7 @@ set(SRC
 set(LIB
  bf_blenkernel
  bf_blenlib
+  PRIVATE bf::dna
 )

 if(WITH_PYTHON)
@@ -41,5 +39,3 @@ endif()

 blender_add_lib(bf_editor_space_console "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

-# dna_type_offsets.h
-add_dependencies(bf_editor_space_console bf_dna)
--- a/source/blender/editors/space_file/CMakeLists.txt
+++ b/source/blender/editors/space_file/CMakeLists.txt
@@ -13,15 +13,12 @@ set(INC
  ../../blentranslation
  ../../gpu
  ../../imbuf
-  ../../makesdna
  ../../makesrna
  ../../render
  ../../windowmanager
  ../../../../intern/guardedalloc
  ../../../../extern/fmtlib/include

-  # dna_type_offsets.h
-  ${CMAKE_CURRENT_BINARY_DIR}/../../makesdna/intern
  # RNA_prototypes.h
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
@@ -50,6 +47,7 @@ set(SRC

 set(LIB
  bf_blenkernel
+  PRIVATE bf::dna
  extern_fmtlib
  PRIVATE bf::intern::atomic
 )
--- a/source/blender/editors/space_graph/CMakeLists.txt
+++ b/source/blender/editors/space_graph/CMakeLists.txt
@@ -10,13 +10,10 @@ set(INC
  ../../blentranslation
  ../../depsgraph
  ../../gpu
-  ../../makesdna
  ../../makesrna
  ../../windowmanager
  ../../../../intern/guardedalloc

-  # dna_type_offsets.h
-  ${CMAKE_CURRENT_BINARY_DIR}/../../makesdna/intern
  # RNA_prototypes.h
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
@@ -41,6 +38,7 @@ set(SRC
 set(LIB
  bf_blenkernel
  bf_blenlib
+  PRIVATE bf::dna
 )

 if(WITH_AUDASPACE)
--- a/source/blender/editors/space_image/CMakeLists.txt
+++ b/source/blender/editors/space_image/CMakeLists.txt
@@ -14,15 +14,12 @@ set(INC
  ../../draw
  ../../gpu
  ../../imbuf
-  ../../makesdna
  ../../makesrna
  ../../render
  ../../windowmanager
  ../../../../intern/clog
  ../../../../intern/guardedalloc

-  # dna_type_offsets.h
-  ${CMAKE_CURRENT_BINARY_DIR}/../../makesdna/intern
  # RNA_prototypes.h
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
@@ -45,6 +42,7 @@ set(SRC
 set(LIB
  bf_blenkernel
  bf_blenlib
+  PRIVATE bf::dna
  bf_editor_uvedit
 )

--- a/source/blender/editors/space_info/CMakeLists.txt
+++ b/source/blender/editors/space_info/CMakeLists.txt
@@ -13,13 +13,10 @@ set(INC
  ../../depsgraph
  ../../gpu
  ../../imbuf
-  ../../makesdna
  ../../makesrna
  ../../windowmanager
  ../../../../intern/guardedalloc

-  # dna_type_offsets.h
-  ${CMAKE_CURRENT_BINARY_DIR}/../../makesdna/intern
  # RNA_prototypes.h
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
@@ -40,6 +37,7 @@ set(SRC
 )

 set(LIB
+  PRIVATE bf::dna
 )


--- a/source/blender/editors/space_nla/CMakeLists.txt
+++ b/source/blender/editors/space_nla/CMakeLists.txt
@@ -10,13 +10,10 @@ set(INC
  ../../blentranslation
  ../../depsgraph
  ../../gpu
-  ../../makesdna
  ../../makesrna
  ../../windowmanager
  ../../../../intern/guardedalloc

-  # dna_type_offsets.h
-  ${CMAKE_CURRENT_BINARY_DIR}/../../makesdna/intern
  # RNA_prototypes.h
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
@@ -39,6 +36,7 @@ set(SRC
 set(LIB
  bf_blenkernel
  bf_blenlib
+  PRIVATE bf::dna
 )


--- a/source/blender/editors/space_node/CMakeLists.txt
+++ b/source/blender/editors/space_node/CMakeLists.txt
@@ -17,7 +17,6 @@ set(INC
  ../../geometry
  ../../gpu
  ../../imbuf
-  ../../makesdna
  ../../makesrna
  ../../nodes
  ../../render
@@ -25,8 +24,6 @@ set(INC
  ../../../../intern/guardedalloc
  ../../../../extern/fmtlib/include

-  # dna_type_offsets.h
-  ${CMAKE_CURRENT_BINARY_DIR}/../../makesdna/intern
  # RNA_prototypes.h
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
@@ -58,6 +55,7 @@ set(SRC
 set(LIB
  bf_blenkernel
  bf_blenlib
+  PRIVATE bf::dna
  bf_editor_screen
  extern_fmtlib
 )
--- a/source/blender/editors/space_outliner/CMakeLists.txt
+++ b/source/blender/editors/space_outliner/CMakeLists.txt
@@ -11,15 +11,12 @@ set(INC
  ../../depsgraph
  ../../gpu
  ../../imbuf
-  ../../makesdna
  ../../makesrna
  ../../sequencer
  ../../windowmanager
  ../../../../intern/clog
  ../../../../intern/guardedalloc

-  # dna_type_offsets.h
-  ${CMAKE_CURRENT_BINARY_DIR}/../../makesdna/intern
  # RNA_prototypes.h
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
@@ -114,6 +111,7 @@ set(SRC
 set(LIB
  bf_blenkernel
  bf_blenlib
+  PRIVATE bf::dna
  bf_editor_undo
 )

--- a/source/blender/editors/space_script/CMakeLists.txt
+++ b/source/blender/editors/space_script/CMakeLists.txt
@@ -9,13 +9,10 @@ set(INC
  ../../blenloader
  ../../blentranslation
  ../../gpu
-  ../../makesdna
  ../../makesrna
  ../../windowmanager
  ../../../../intern/guardedalloc

-  # dna_type_offsets.h
-  ${CMAKE_CURRENT_BINARY_DIR}/../../makesdna/intern
 )

 set(INC_SYS
@@ -30,6 +27,7 @@ set(SRC
 )

 set(LIB
+  PRIVATE bf::dna
 )

 if(WITH_PYTHON)
@@ -42,5 +40,3 @@ endif()

 blender_add_lib(bf_editor_space_script "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

-# dna_type_offsets.h
-add_dependencies(bf_editor_space_script bf_dna)
--- a/source/blender/editors/space_sequencer/CMakeLists.txt
+++ b/source/blender/editors/space_sequencer/CMakeLists.txt
@@ -13,14 +13,11 @@ set(INC
  ../../draw
  ../../gpu
  ../../imbuf
-  ../../makesdna
  ../../makesrna
  ../../sequencer
  ../../windowmanager
  ../../../../intern/guardedalloc

-  # dna_type_offsets.h
-  ${CMAKE_CURRENT_BINARY_DIR}/../../makesdna/intern
  # RNA_prototypes.h
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
@@ -53,6 +50,7 @@ set(SRC
 )

 set(LIB
+  PRIVATE bf::dna
  bf_editor_interface
  bf_editor_util
  PRIVATE bf::intern::atomic
--- a/source/blender/editors/space_spreadsheet/CMakeLists.txt
+++ b/source/blender/editors/space_spreadsheet/CMakeLists.txt
@@ -13,14 +13,11 @@ set(INC
  ../../depsgraph
  ../../functions
  ../../gpu
-  ../../makesdna
  ../../makesrna
  ../../nodes
  ../../windowmanager
  ../../../../intern/guardedalloc

-  # dna_type_offsets.h
-  ${CMAKE_CURRENT_BINARY_DIR}/../../makesdna/intern
  # RNA_prototypes.h
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
@@ -56,6 +53,7 @@ set(SRC
 )

 set(LIB
+  PRIVATE bf::dna
 )

 if(WITH_OPENVDB)
--- a/source/blender/editors/space_statusbar/CMakeLists.txt
+++ b/source/blender/editors/space_statusbar/CMakeLists.txt
@@ -9,13 +9,10 @@ set(INC
  ../../blenloader
  ../../blentranslation
  ../../gpu
-  ../../makesdna
  ../../makesrna
  ../../windowmanager
  ../../../../intern/guardedalloc

-  # dna_type_offsets.h
-  ${CMAKE_CURRENT_BINARY_DIR}/../../makesdna/intern
  # RNA_prototypes.h
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
@@ -30,6 +27,7 @@ set(SRC
 set(LIB
  bf_blenkernel
  bf_blenlib
+  PRIVATE bf::dna
 )


--- a/source/blender/editors/space_text/CMakeLists.txt
+++ b/source/blender/editors/space_text/CMakeLists.txt
@@ -10,13 +10,10 @@ set(INC
  ../../blenloader
  ../../blentranslation
  ../../gpu
-  ../../makesdna
  ../../makesrna
  ../../windowmanager
  ../../../../intern/guardedalloc

-  # dna_type_offsets.h
-  ${CMAKE_CURRENT_BINARY_DIR}/../../makesdna/intern
 )

 set(INC_SYS
@@ -42,6 +39,7 @@ set(SRC
 set(LIB
  bf_blenkernel
  bf_blenlib
+  PRIVATE bf::dna
 )


@@ -55,5 +53,3 @@ endif()

 blender_add_lib(bf_editor_space_text "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

-# dna_type_offsets.h
-add_dependencies(bf_editor_space_text bf_dna)
--- a/source/blender/editors/space_topbar/CMakeLists.txt
+++ b/source/blender/editors/space_topbar/CMakeLists.txt
@@ -9,13 +9,10 @@ set(INC
  ../../blenloader
  ../../blentranslation
  ../../gpu
-  ../../makesdna
  ../../makesrna
  ../../windowmanager
  ../../../../intern/guardedalloc

-  # dna_type_offsets.h
-  ${CMAKE_CURRENT_BINARY_DIR}/../../makesdna/intern
  # RNA_prototypes.h
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
@@ -28,6 +25,7 @@ set(SRC
 )

 set(LIB
+  PRIVATE bf::dna
 )


--- a/source/blender/editors/space_userpref/CMakeLists.txt
+++ b/source/blender/editors/space_userpref/CMakeLists.txt
@@ -7,13 +7,10 @@ set(INC
  ../../blenkernel
  ../../blenlib
  ../../blenloader
-  ../../makesdna
  ../../makesrna
  ../../windowmanager
  ../../../../intern/guardedalloc

-  # dna_type_offsets.h
-  ${CMAKE_CURRENT_BINARY_DIR}/../../makesdna/intern
 )

 set(INC_SYS
@@ -28,9 +25,8 @@ set(SRC
 )

 set(LIB
+  PRIVATE bf::dna
 )

 blender_add_lib(bf_editor_space_userpref "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

-# dna_type_offsets.h
-add_dependencies(bf_editor_space_userpref bf_dna)
--- a/source/blender/editors/space_view3d/CMakeLists.txt
+++ b/source/blender/editors/space_view3d/CMakeLists.txt
@@ -15,15 +15,12 @@ set(INC
  ../../draw
  ../../gpu
  ../../imbuf
-  ../../makesdna
  ../../makesrna
  ../../render
  ../../windowmanager
  ../../../../intern/guardedalloc
  ../../../../intern/mantaflow/extern

-  # dna_type_offsets.h
-  ${CMAKE_CURRENT_BINARY_DIR}/../../makesdna/intern
  # RNA_prototypes.h
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
@@ -76,6 +73,7 @@ set(SRC
 )

 set(LIB
+  PRIVATE bf::dna
  bf_editor_curves
  bf_editor_lattice
  bf_editor_mesh
@@ -96,7 +94,5 @@ endif()

 blender_add_lib(bf_editor_space_view3d "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

-# Needed so we can use dna_type_offsets.h for defaults initialization.
-add_dependencies(bf_editor_space_view3d bf_dna)
 # RNA_prototypes.h
 add_dependencies(bf_editor_space_view3d bf_rna)
--- a/source/blender/editors/transform/CMakeLists.txt
+++ b/source/blender/editors/transform/CMakeLists.txt
@@ -12,7 +12,6 @@ set(INC
  ../../depsgraph
  ../../gpu
  ../../ikplugin
-  ../../makesdna
  ../../makesrna
  ../../render
  ../../sequencer
@@ -122,6 +121,7 @@ set(LIB
  bf_blenkernel
  bf_blenlib
  bf_bmesh
+  PRIVATE bf::dna
  bf_editor_mask
  bf_gpu
 )
--- a/source/blender/editors/undo/CMakeLists.txt
+++ b/source/blender/editors/undo/CMakeLists.txt
@@ -9,7 +9,6 @@ set(INC
  ../../blenlib
  ../../blenloader
  ../../blentranslation
-  ../../makesdna
  ../../makesrna
  ../../windowmanager
  ../../../../intern/clog
@@ -31,6 +30,7 @@ set(SRC
 set(LIB
  bf_blenkernel
  bf_blenlib
+  PRIVATE bf::dna
  bf_editor_curve
  bf_editor_curves
  bf_editor_lattice
--- a/source/blender/editors/util/CMakeLists.txt
+++ b/source/blender/editors/util/CMakeLists.txt
@@ -14,7 +14,6 @@ set(INC
  ../../depsgraph
  ../../gpu
  ../../imbuf
-  ../../makesdna
  ../../makesrna
  ../../sequencer
  ../../windowmanager
@@ -110,6 +109,7 @@ set(SRC
 )

 set(LIB
+  PRIVATE bf::dna
 )


--- a/source/blender/editors/uvedit/CMakeLists.txt
+++ b/source/blender/editors/uvedit/CMakeLists.txt
@@ -11,7 +11,6 @@ set(INC
  ../../depsgraph
  ../../geometry
  ../../gpu
-  ../../makesdna
  ../../makesrna
  ../../windowmanager
  ../../../../intern/eigen
@@ -42,6 +41,7 @@ set(SRC

 set(LIB
  bf_bmesh
+  PRIVATE bf::dna
 )


--- a/source/blender/freestyle/CMakeLists.txt
+++ b/source/blender/freestyle/CMakeLists.txt
@@ -530,6 +530,7 @@ set(SRC
 )

 set(LIB
+  PRIVATE bf::dna
  bf_python_mathutils

  ${PYTHON_LINKFLAGS}
@@ -543,7 +544,6 @@ set(INC
  ../blentranslation
  ../depsgraph
  ../imbuf
-  ../makesdna
  ../makesrna
  ../python
  ../python/intern
--- a/source/blender/functions/CMakeLists.txt
+++ b/source/blender/functions/CMakeLists.txt
@@ -5,7 +5,6 @@
 set(INC
  .
  ../blenlib
-  ../makesdna
  ../../../intern/guardedalloc
 )

@@ -51,6 +50,7 @@ set(SRC

 set(LIB
  bf_blenlib
+  PRIVATE bf::dna
 )

 if(WITH_TBB)
--- a/source/blender/geometry/CMakeLists.txt
+++ b/source/blender/geometry/CMakeLists.txt
@@ -8,11 +8,9 @@ set(INC
  ../blenlib
  ../blentranslation
  ../functions
-  ../makesdna
  ../makesrna
  ../../../intern/eigen
  ../../../intern/guardedalloc
-  ${CMAKE_BINARY_DIR}/source/blender/makesdna/intern
 )

 set(SRC
@@ -62,6 +60,7 @@ set(SRC
 set(LIB
  bf_blenkernel
  bf_blenlib
+  PRIVATE bf::dna
 )

 if(WITH_OPENVDB)
--- a/source/blender/gpencil_modifiers_legacy/CMakeLists.txt
+++ b/source/blender/gpencil_modifiers_legacy/CMakeLists.txt
@@ -12,15 +12,12 @@ set(INC
  ../bmesh
  ../depsgraph
  ../editors/include
-  ../makesdna
  ../makesrna
  ../render
  ../windowmanager
  ../../../intern/eigen
  ../../../intern/guardedalloc

-  # dna_type_offsets.h in BLO_read_write.h
-  ${CMAKE_BINARY_DIR}/source/blender/makesdna/intern
  # RNA_prototypes.h
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
@@ -93,10 +90,10 @@ list(APPEND LIB
 endif()

 set(LIB
+  PRIVATE bf::dna
 )

 blender_add_lib(bf_gpencil_modifiers_legacy "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

-add_dependencies(bf_gpencil_modifiers_legacy bf_dna)
 # RNA_prototypes.h
 add_dependencies(bf_gpencil_modifiers_legacy bf_rna)
--- a/source/blender/gpu/CMakeLists.txt
+++ b/source/blender/gpu/CMakeLists.txt
@@ -21,7 +21,6 @@ set(INC
  ../bmesh
  ../draw
  ../imbuf
-  ../makesdna
  ../makesrna

  # For theme color access.
@@ -326,6 +325,7 @@ set(METAL_SRC
 )

 set(LIB
+  PRIVATE bf::dna
  PRIVATE bf::intern::atomic
  ${Epoxy_LIBRARIES}
 )
--- a/source/blender/ikplugin/CMakeLists.txt
+++ b/source/blender/ikplugin/CMakeLists.txt
@@ -8,7 +8,6 @@ set(INC
  .
  ../blenkernel
  ../blenlib
-  ../makesdna
  ../../../intern/guardedalloc
 )

@@ -24,6 +23,7 @@ set(SRC
 )

 set(LIB
+  PRIVATE bf::dna
 )

 if(WITH_IK_SOLVER)
--- a/source/blender/imbuf/CMakeLists.txt
+++ b/source/blender/imbuf/CMakeLists.txt
@@ -8,7 +8,6 @@ set(INC
  ../blenlib
  ../blenloader
  ../gpu
-  ../makesdna
  ../makesrna
  ../sequencer
  ../../../intern/guardedalloc
@@ -79,6 +78,7 @@ set(LIB
  bf_blenkernel
  bf_blenlib
  bf_blenloader
+  PRIVATE bf::dna
  bf_imbuf_openimageio
  bf_intern_guardedalloc
  bf_intern_memutil
--- a/source/blender/imbuf/intern/cineon/CMakeLists.txt
+++ b/source/blender/imbuf/intern/cineon/CMakeLists.txt
@@ -8,7 +8,6 @@ set(INC
  ../..
  ../../../blenkernel
  ../../../blenlib
-  ../../../makesdna
  ../../../../../intern/guardedalloc
 )

@@ -30,6 +29,7 @@ set(SRC
 )

 set(LIB
+  PRIVATE bf::dna
 )

 if(WITH_IMAGE_CINEON)
--- a/source/blender/imbuf/intern/oiio/CMakeLists.txt
+++ b/source/blender/imbuf/intern/oiio/CMakeLists.txt
@@ -8,7 +8,6 @@ set(INC
  ../..
  ../../../blenkernel
  ../../../blenlib
-  ../../../makesdna
  ../../../../../intern/guardedalloc
  ../../../../../intern/utfconv
 )
@@ -28,6 +27,7 @@ set(SRC
 set(LIB
  ${OPENIMAGEIO_LIBRARIES}
  ${PUGIXML_LIBRARIES}
+  PRIVATE bf::dna
 )

 if(WITH_IMAGE_OPENEXR)
--- a/source/blender/imbuf/intern/openexr/CMakeLists.txt
+++ b/source/blender/imbuf/intern/openexr/CMakeLists.txt
@@ -8,7 +8,6 @@ set(INC
  ../..
  ../../../blenkernel
  ../../../blenlib
-  ../../../makesdna
  ../../../../../intern/guardedalloc
  ../../../../../intern/utfconv
 )
@@ -23,6 +22,7 @@ set(SRC
 )

 set(LIB
+  PRIVATE bf::dna
 )

 if(WITH_IMAGE_OPENEXR)
--- a/source/blender/io/alembic/CMakeLists.txt
+++ b/source/blender/io/alembic/CMakeLists.txt
@@ -12,7 +12,6 @@ set(INC
  ../../bmesh
  ../../depsgraph
  ../../editors/include
-  ../../makesdna
  ../../makesrna
  ../../windowmanager
  ../../../../intern/clog
@@ -93,6 +92,7 @@ set(SRC
 set(LIB
  bf_blenkernel
  bf_blenlib
+  PRIVATE bf::dna
  bf_io_common

  ${ALEMBIC_LIBRARIES}
--- a/source/blender/io/avi/CMakeLists.txt
+++ b/source/blender/io/avi/CMakeLists.txt
@@ -6,7 +6,6 @@ set(INC
  .
  ../../blenlib
  ../../imbuf
-  ../../makesdna
  ../../../../intern/guardedalloc
 )

@@ -33,6 +32,7 @@ set(SRC

 set(LIB
  ${JPEG_LIBRARIES}
+  PRIVATE bf::dna
 )

 blender_add_lib(bf_avi "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
--- a/source/blender/io/collada/CMakeLists.txt
+++ b/source/blender/io/collada/CMakeLists.txt
@@ -27,7 +27,6 @@ set(INC
  ../../depsgraph
  ../../editors/include
  ../../imbuf
-  ../../makesdna
  ../../makesrna
  ../../windowmanager
  ../../../../intern/guardedalloc
@@ -117,6 +116,7 @@ set(LIB
  ${OPENCOLLADA_LIBRARIES}
  ${PCRE_LIBRARIES}
  ${XML2_LIBRARIES}
+  PRIVATE bf::dna
 )

 if(WITH_BUILDINFO)
--- a/source/blender/io/common/CMakeLists.txt
+++ b/source/blender/io/common/CMakeLists.txt
@@ -7,7 +7,6 @@ set(INC
  ../../blenkernel
  ../../blenlib
  ../../depsgraph
-  ../../makesdna
  ../../../../intern/guardedalloc
  ../../makesrna
 )
@@ -35,6 +34,7 @@ set(SRC
 set(LIB
  bf_blenkernel
  bf_blenlib
+  PRIVATE bf::dna
 )

 blender_add_lib(bf_io_common "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
--- a/source/blender/io/gpencil/CMakeLists.txt
+++ b/source/blender/io/gpencil/CMakeLists.txt
@@ -11,7 +11,6 @@ set(INC
  ../../bmesh
  ../../depsgraph
  ../../editors/include
-  ../../makesdna
  ../../makesrna
  ../../windowmanager
  ../../../../intern/clog
@@ -42,6 +41,7 @@ set(SRC
 set(LIB
  bf_blenkernel
  bf_blenlib
+  PRIVATE bf::dna
  bf_io_common
 )

--- a/source/blender/io/ply/CMakeLists.txt
+++ b/source/blender/io/ply/CMakeLists.txt
@@ -13,7 +13,6 @@ set(INC
  ../../bmesh
  ../../depsgraph
  ../../geometry
-  ../../makesdna
  ../../makesrna
  ../../windowmanager
  ../../../../intern/guardedalloc
@@ -56,6 +55,7 @@ set(SRC

 set(LIB
  bf_blenkernel
+  PRIVATE bf::dna
  bf_io_common
  extern_fmtlib
 )
--- a/source/blender/io/stl/CMakeLists.txt
+++ b/source/blender/io/stl/CMakeLists.txt
@@ -12,7 +12,6 @@ set(INC
  ../../bmesh/intern
  ../../depsgraph
  ../../editors/include
-  ../../makesdna
  ../../makesrna
  ../../nodes
  ../../windowmanager
@@ -39,6 +38,7 @@ set(SRC

 set(LIB
  bf_blenkernel
+  PRIVATE bf::dna
  bf_io_common
 )

--- a/source/blender/io/usd/CMakeLists.txt
+++ b/source/blender/io/usd/CMakeLists.txt
@@ -54,7 +54,6 @@ set(INC
  ../../depsgraph
  ../../editors/include
  ../../imbuf
-  ../../makesdna
  ../../makesrna
  ../../windowmanager
  ../../../../intern/guardedalloc
@@ -130,6 +129,7 @@ set(SRC
 set(LIB
  bf_blenkernel
  bf_blenlib
+  PRIVATE bf::dna
  bf_imbuf
  bf_io_common
 )
--- a/source/blender/io/wavefront_obj/CMakeLists.txt
+++ b/source/blender/io/wavefront_obj/CMakeLists.txt
@@ -13,7 +13,6 @@ set(INC
  ../../bmesh/intern
  ../../depsgraph
  ../../editors/include
-  ../../makesdna
  ../../makesrna
  ../../nodes
  ../../windowmanager
@@ -59,6 +58,7 @@ set(SRC

 set(LIB
  bf_blenkernel
+  PRIVATE bf::dna
  bf_io_common
  extern_fmtlib
 )
--- a/source/blender/makesdna/intern/CMakeLists.txt
+++ b/source/blender/makesdna/intern/CMakeLists.txt
@@ -5,11 +5,11 @@
 # message(STATUS "Configuring makesdna")

 set(INC
-  ..
+  PUBLIC ..
+  PUBLIC ${CMAKE_CURRENT_BINARY_DIR}
  ../../blenlib
  ../../imbuf
  ../../../../intern/guardedalloc
-  ${CMAKE_CURRENT_BINARY_DIR}
 )

 set(INC_SYS
@@ -140,6 +140,8 @@ set_source_files_properties(
 )

 blender_add_lib(bf_dna "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
+add_library(bf::dna ALIAS bf_dna)
+


 # -----------------------------------------------------------------------------
--- a/source/blender/makesrna/intern/CMakeLists.txt
+++ b/source/blender/makesrna/intern/CMakeLists.txt
@@ -229,7 +229,6 @@ set(INC
  ../../gpu
  ../../ikplugin
  ../../imbuf
-  ../../makesdna
  ../../modifiers
  ../../nodes
  ../../sequencer
@@ -243,10 +242,7 @@ set(INC
  ../../../../intern/memutil
  ../../../../intern/mantaflow/extern

-  ${CMAKE_BINARY_DIR}/source/blender/makesdna/intern

-  # dna_type_offsets.h
-  ${CMAKE_CURRENT_BINARY_DIR}/../../makesdna/intern
  # RNA_prototypes.h
  ${CMAKE_CURRENT_BINARY_DIR}/../../makesrna/
 )
@@ -466,7 +462,7 @@ set(SRC
 )

 set(LIB
-  bf_dna
+  PRIVATE bf::dna
  bf_editor_space_api

  bf_editor_animation
@@ -490,5 +486,3 @@ set(LIB

 blender_add_lib(bf_rna "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

-# Needed so we can use dna_type_offsets.h for defaults initialization.
-add_dependencies(bf_blenkernel bf_dna)
--- a/source/blender/modifiers/CMakeLists.txt
+++ b/source/blender/modifiers/CMakeLists.txt
@@ -15,7 +15,6 @@ set(INC
  ../editors/include
  ../functions
  ../geometry
-  ../makesdna
  ../makesrna
  ../nodes
  ../render
@@ -23,8 +22,6 @@ set(INC
  ../../../intern/eigen
  ../../../intern/guardedalloc

-  # dna_type_offsets.h in BLO_read_write.h
-  ${CMAKE_BINARY_DIR}/source/blender/makesdna/intern
  # RNA_prototypes.h
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
@@ -114,6 +111,7 @@ set(SRC
 set(LIB
  bf_blenkernel
  bf_blenlib
+  PUBLIC bf::dna
 )

 if(WITH_ALEMBIC)
@@ -220,9 +218,5 @@ endif()

 blender_add_lib(bf_modifiers "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

-# Some modifiers include BLO_read_write.h, which includes dna_type_offsets.h
-# which is generated by bf_dna. Need to ensure compilaiton order here.
-# Also needed so we can use dna_type_offsets.h for defaults initialization.
-add_dependencies(bf_modifiers bf_dna)
 # RNA_prototypes.h
 add_dependencies(bf_modifiers bf_rna)
--- a/source/blender/nodes/CMakeLists.txt
+++ b/source/blender/nodes/CMakeLists.txt
@@ -26,15 +26,12 @@ set(INC
  ../geometry
  ../gpu
  ../imbuf
-  ../makesdna
  ../makesrna
  ../render
  ../windowmanager
  ../../../extern/fmtlib/include
  ../../../intern/guardedalloc

-  # dna_type_offsets.h
-  ${CMAKE_CURRENT_BINARY_DIR}/../makesdna/intern
  # RNA_prototypes.h
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
@@ -85,6 +82,7 @@ set(SRC

 set(LIB
  bf_bmesh
+  PRIVATE bf::dna
  bf_functions
  bf_nodes_composite
  bf_nodes_function
@@ -150,7 +148,5 @@ endif()

 blender_add_lib(bf_nodes "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

-# Needed so we can use dna_type_offsets.h for defaults initialization.
-add_dependencies(bf_nodes bf_dna)
 # RNA_prototypes.h
 add_dependencies(bf_nodes bf_rna)
--- a/source/blender/nodes/composite/CMakeLists.txt
+++ b/source/blender/nodes/composite/CMakeLists.txt
@@ -14,7 +14,6 @@ set(INC
  ../../functions
  ../../gpu
  ../../imbuf
-  ../../makesdna
  ../../makesrna
  ../../render
  ../../windowmanager
@@ -23,8 +22,6 @@ set(INC
  ../../compositor/realtime_compositor/cached_resources
  ../../../../intern/guardedalloc

-  # dna_type_offsets.h
-  ${CMAKE_CURRENT_BINARY_DIR}/../../makesdna/intern
  # RNA_prototypes.h
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
@@ -132,6 +129,7 @@ set(SRC
 )

 set(LIB
+  PRIVATE bf::dna
  bf_realtime_compositor
 )

@@ -166,7 +164,5 @@ if(WITH_UNITY_BUILD)
  set_target_properties(bf_nodes_composite PROPERTIES UNITY_BUILD_BATCH_SIZE 10)
 endif()

-# Needed so we can use dna_type_offsets.h for defaults initialization.
-add_dependencies(bf_nodes_composite bf_dna)
 # RNA_prototypes.h
 add_dependencies(bf_nodes_composite bf_rna)
--- a/source/blender/nodes/function/CMakeLists.txt
+++ b/source/blender/nodes/function/CMakeLists.txt
@@ -11,7 +11,6 @@ set(INC
  ../../blentranslation
  ../../editors/include
  ../../functions
-  ../../makesdna
  ../../makesrna
  ../../windowmanager
  ../../../../intern/guardedalloc
@@ -48,6 +47,7 @@ set(SRC
 )

 set(LIB
+  PRIVATE bf::dna
  bf_functions
 )

--- a/source/blender/nodes/geometry/CMakeLists.txt
+++ b/source/blender/nodes/geometry/CMakeLists.txt
@@ -16,7 +16,6 @@ set(INC
  ../../geometry
  ../../gpu
  ../../imbuf
-  ../../makesdna
  ../../makesrna
  ../../render
  ../../windowmanager
@@ -202,6 +201,7 @@ set(SRC

 set(LIB
  bf_bmesh
+  PRIVATE bf::dna
  bf_functions
  bf_geometry
  bf_nodes
--- a/source/blender/nodes/shader/CMakeLists.txt
+++ b/source/blender/nodes/shader/CMakeLists.txt
@@ -14,7 +14,6 @@ set(INC
  ../../functions
  ../../gpu
  ../../imbuf
-  ../../makesdna
  ../../makesrna
  ../../render
  ../../windowmanager
@@ -129,6 +128,7 @@ set(SRC
 )

 set(LIB
+  PRIVATE bf::dna
  bf_functions
  bf_intern_sky
  bf_nodes
--- a/source/blender/nodes/texture/CMakeLists.txt
+++ b/source/blender/nodes/texture/CMakeLists.txt
@@ -12,7 +12,6 @@ set(INC
  ../../blentranslation
  ../../depsgraph
  ../../imbuf
-  ../../makesdna
  ../../makesrna
  ../../render
  ../../windowmanager
@@ -61,6 +60,7 @@ set(SRC
 )

 set(LIB
+  PRIVATE bf::dna
  bf_nodes
 )

--- a/source/blender/python/bmesh/CMakeLists.txt
+++ b/source/blender/python/bmesh/CMakeLists.txt
@@ -8,7 +8,6 @@ set(INC
  ../../blenlib
  ../../bmesh
  ../../depsgraph
-  ../../makesdna
  ../../../../intern/guardedalloc
 )

@@ -41,6 +40,7 @@ set(SRC
 set(LIB
  bf_blenkernel
  bf_blenlib
+  PRIVATE bf::dna
  bf_python_mathutils

  ${PYTHON_LINKFLAGS}
--- a/source/blender/python/generic/CMakeLists.txt
+++ b/source/blender/python/generic/CMakeLists.txt
@@ -7,7 +7,6 @@ set(INC
  ../../blenkernel
  ../../blenlib
  ../../gpu
-  ../../makesdna
  ../../makesrna
  ../../../../intern/clog
  ../../../../intern/guardedalloc
@@ -46,6 +45,7 @@ set(LIB
  ${Epoxy_LIBRARIES}
  ${PYTHON_LINKFLAGS}
  ${PYTHON_LIBRARIES}
+  PRIVATE bf::dna
 )

 if(WITH_PYTHON_MODULE)
--- a/source/blender/python/gpu/CMakeLists.txt
+++ b/source/blender/python/gpu/CMakeLists.txt
@@ -9,7 +9,6 @@ set(INC
  ../../editors/include
  ../../gpu
  ../../imbuf
-  ../../makesdna
  ../../../../intern/guardedalloc
 )

@@ -63,6 +62,7 @@ set(LIB
  ${Epoxy_LIBRARIES}
  ${PYTHON_LINKFLAGS}
  ${PYTHON_LIBRARIES}
+  PRIVATE bf::dna
 )

 blender_add_lib(bf_python_gpu "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
--- a/source/blender/python/intern/CMakeLists.txt
+++ b/source/blender/python/intern/CMakeLists.txt
@@ -13,7 +13,6 @@ set(INC
  ../../gpu
  ../../imbuf
  ../../imbuf/intern/oiio
-  ../../makesdna
  ../../makesrna
  ../../windowmanager
  ../../../../intern/clog
@@ -123,6 +122,7 @@ set(SRC
 )

 set(LIB
+  PRIVATE bf::dna
  bf_editor_animation
  bf_editor_interface
  bf_editor_space_api
--- a/source/blender/python/mathutils/CMakeLists.txt
+++ b/source/blender/python/mathutils/CMakeLists.txt
@@ -9,7 +9,6 @@ set(INC
  ../../bmesh
  ../../depsgraph
  ../../imbuf
-  ../../makesdna
  ../../../../intern/guardedalloc
 )

@@ -45,6 +44,7 @@ set(SRC

 set(LIB
  bf_blenlib
+  PRIVATE bf::dna
  bf_imbuf
  bf_python_ext

--- a/source/blender/render/CMakeLists.txt
+++ b/source/blender/render/CMakeLists.txt
@@ -16,7 +16,6 @@ set(INC
  ../gpu
  ../gpu/intern
  ../imbuf
-  ../makesdna
  ../makesrna
  ../nodes
  ../sequencer
@@ -60,6 +59,7 @@ set(SRC
 )

 set(LIB
+  PRIVATE bf::dna
  bf_realtime_compositor
  PRIVATE bf::intern::atomic
 )
--- a/source/blender/sequencer/CMakeLists.txt
+++ b/source/blender/sequencer/CMakeLists.txt
@@ -12,15 +12,12 @@ set(INC
  ../blentranslation
  ../depsgraph
  ../imbuf
-  ../makesdna
  ../makesrna
  ../render
  ../windowmanager
  ../../../intern/clog
  ../../../intern/guardedalloc

-  # dna_type_offsets.h
-  ${CMAKE_CURRENT_BINARY_DIR}/../makesdna/intern
  # RNA_prototypes.h
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
@@ -90,6 +87,7 @@ set(SRC
 set(LIB
  bf_blenkernel
  bf_blenlib
+  PRIVATE bf::dna
  PRIVATE bf::intern::atomic
 )

@@ -108,7 +106,5 @@ endif()

 blender_add_lib(bf_sequencer "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

-# Needed so we can use dna_type_offsets.h.
-add_dependencies(bf_sequencer bf_dna)
 # RNA_prototypes.h
 add_dependencies(bf_sequencer bf_rna)
--- a/source/blender/shader_fx/CMakeLists.txt
+++ b/source/blender/shader_fx/CMakeLists.txt
@@ -12,7 +12,6 @@ set(INC
  ../bmesh
  ../depsgraph
  ../editors/include
-  ../makesdna
  ../makesrna
  ../render
  ../windowmanager
@@ -46,6 +45,7 @@ set(SRC
 )

 set(LIB
+  PRIVATE bf::dna
 )


--- a/source/blender/simulation/CMakeLists.txt
+++ b/source/blender/simulation/CMakeLists.txt
@@ -10,7 +10,6 @@ set(INC
  ../depsgraph
  ../functions
  ../imbuf
-  ../makesdna
  ../makesrna
  ../nodes
  ../../../intern/guardedalloc
@@ -35,6 +34,7 @@ set(SRC

 set(LIB
  bf_blenkernel
+  PRIVATE bf::dna
 )

 if(WITH_OPENMP_STATIC)
--- a/source/blender/windowmanager/CMakeLists.txt
+++ b/source/blender/windowmanager/CMakeLists.txt
@@ -18,7 +18,6 @@ set(INC
  ../draw
  ../gpu
  ../imbuf
-  ../makesdna
  ../makesrna
  ../nodes
  ../render
@@ -29,8 +28,6 @@ set(INC
  ../../../intern/memutil
  ../bmesh

-  # for writefile.c: dna_type_offsets.h
-  ${CMAKE_BINARY_DIR}/source/blender/makesdna/intern
  # RNA_prototypes.h
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
@@ -102,6 +99,7 @@ set(SRC
 )

 set(LIB
+  PRIVATE bf::dna
  bf_editor_screen
  bf_sequencer
 )
@@ -204,7 +202,5 @@ endif()

 blender_add_lib_nolist(bf_windowmanager "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

-# Needed so we can use dna_type_offsets.h for defaults initialization.
-add_dependencies(bf_windowmanager bf_dna)
 # RNA_prototypes.h
 add_dependencies(bf_windowmanager bf_rna)
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -13,13 +13,13 @@ set(INC
  ../blender/imbuf
  ../blender/io/usd
  ../blender/bmesh
-  ../blender/makesdna
  ../blender/makesrna
  ../blender/render
  ../blender/windowmanager
 )

 set(LIB
+  PRIVATE bf::dna
  bf_windowmanager
 )