Cleanup: CMake: Modernize bf_blenlib dependencies

Pretty straightforward - Remove any blenlib paths from INC - Add a dependency though LIB Pull Request: https://projects.blender.org/blender/blender/pulls/109934
2023-07-10 22:04:18 +02:00
parent 093a4d63f3
commit 04235d0e55
100 changed files with 101 additions and 146 deletions
--- a/intern/cycles/blender/CMakeLists.txt
+++ b/intern/cycles/blender/CMakeLists.txt
@@ -7,7 +7,6 @@ set(INC
  ../../mikktspace
  ../../../source/blender/makesrna
  ../../../source/blender/blenkernel
-  ../../../source/blender/blenlib
  ../../../source/blender/gpu
  ../../../source/blender/render
  ${CMAKE_BINARY_DIR}/source/blender/makesrna/intern
@@ -58,6 +57,7 @@ set(SRC
 )

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

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

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

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

 # Python is always required
@@ -72,6 +71,7 @@ set(SRC
 )

 set(LIB
+  PRIVATE bf::blenlib
  PRIVATE bf::dna
  PRIVATE bf::intern::guardedalloc
  extern_mantaflow
--- a/intern/memutil/CMakeLists.txt
+++ b/intern/memutil/CMakeLists.txt
@@ -5,7 +5,6 @@
 set(INC
  .
  ..
-  ../../source/blender/blenlib
 )

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

 set(LIB
+  PRIVATE bf::blenlib
 )

 blender_add_lib(bf_intern_memutil "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
--- a/intern/opencolorio/CMakeLists.txt
+++ b/intern/opencolorio/CMakeLists.txt
@@ -4,7 +4,6 @@

 set(INC
  .
-  ../../source/blender/blenlib
  ../../source/blender/gpu
  ../../source/blender/gpu/intern
 )
@@ -23,6 +22,7 @@ set(SRC
 )

 set(LIB
+  PRIVATE bf::blenlib
  PRIVATE bf::dna
  PRIVATE bf::intern::guardedalloc
 )
--- a/source/blender/asset_system/CMakeLists.txt
+++ b/source/blender/asset_system/CMakeLists.txt
@@ -6,7 +6,6 @@ set(INC
  .
  intern
  ../blenkernel
-  ../blenlib
  ../../../intern/clog
 )

@@ -41,6 +40,7 @@ set(SRC

 set(LIB
  bf_blenkernel
+  PRIVATE bf::blenlib
  PRIVATE bf::dna
  PRIVATE bf::intern::guardedalloc
 )
--- a/source/blender/blenfont/CMakeLists.txt
+++ b/source/blender/blenfont/CMakeLists.txt
@@ -5,7 +5,6 @@
 set(INC
  .
  ../blenkernel
-  ../blenlib
  ../blentranslation
  ../gpu
  ../imbuf
@@ -32,6 +31,7 @@ set(SRC
 )

 set(LIB
+  PRIVATE bf::blenlib
  PRIVATE bf::dna
  bf_gpu
  PRIVATE bf::intern::guardedalloc
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -6,7 +6,6 @@ set(INC
  .
  ../asset_system
  ../blenfont
-  ../blenlib
  ../blenloader
  ../blentranslation
  ../bmesh
@@ -530,7 +529,7 @@ set(SRC
 set(LIB
  bf_asset_system
  bf_blenfont
-  bf_blenlib
+  PRIVATE bf::blenlib
  bf_blenloader
  bf_blentranslation
  bf_bmesh
--- a/source/blender/blenlib/CMakeLists.txt
+++ b/source/blender/blenlib/CMakeLists.txt
@@ -7,8 +7,7 @@ if(HAVE_EXECINFO_H)
 endif()

 set(INC
-  .
-  ..
+  PUBLIC .
  ../../../intern/eigen
 )

@@ -474,6 +473,7 @@ set_source_files_properties(
 )

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

 if(WITH_GTESTS)
  set(TEST_SRC
--- a/source/blender/blenloader/CMakeLists.txt
+++ b/source/blender/blenloader/CMakeLists.txt
@@ -6,7 +6,6 @@ set(INC
  .
  ../blenfont
  ../blenkernel
-  ../blenlib
  ../blentranslation
  ../depsgraph
  ../draw
@@ -62,7 +61,7 @@ set(SRC

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

 set(LIB
  bf_blenkernel
-  bf_blenlib
+  PRIVATE bf::blenlib
  PRIVATE bf::dna
  PRIVATE bf::intern::guardedalloc
 )
--- a/source/blender/blentranslation/msgfmt/CMakeLists.txt
+++ b/source/blender/blentranslation/msgfmt/CMakeLists.txt
@@ -6,7 +6,6 @@
 # Build msgfmt executable

 set(INC
-  ../../blenlib
 )

 set(SRC
@@ -14,7 +13,7 @@ set(SRC
 )

 set(LIB
-  PRIVATE bf_blenlib
+  PRIVATE PRIVATE bf::blenlib
  PRIVATE bf::intern::guardedalloc
  ${ZLIB_LIBRARIES}
  ${PLATFORM_LINKLIBS})
--- a/source/blender/bmesh/CMakeLists.txt
+++ b/source/blender/bmesh/CMakeLists.txt
@@ -5,7 +5,6 @@
 set(INC
  .
  ../blenkernel
-  ../blenlib
  ../blentranslation
  ../depsgraph
  ../../../intern/clog
@@ -168,7 +167,7 @@ set(SRC

 set(LIB
  bf_blenkernel
-  bf_blenlib
+  PRIVATE bf::blenlib
  PRIVATE bf::dna
  PRIVATE bf::intern::guardedalloc
  extern_rangetree
--- a/source/blender/compositor/CMakeLists.txt
+++ b/source/blender/compositor/CMakeLists.txt
@@ -11,7 +11,6 @@ if(WITH_COMPOSITOR_CPU)
    nodes
    operations
    ../blenkernel
-    ../blenlib
    ../blentranslation
    ../depsgraph
    ../imbuf
@@ -596,7 +595,7 @@ if(WITH_COMPOSITOR_CPU)

  set(LIB
    bf_blenkernel
-    bf_blenlib
+    PRIVATE bf::blenlib
    PRIVATE bf::dna
    PRIVATE bf::intern::guardedalloc
    extern_clew
--- a/source/blender/compositor/realtime_compositor/CMakeLists.txt
+++ b/source/blender/compositor/realtime_compositor/CMakeLists.txt
@@ -7,7 +7,6 @@ set(INC
  algorithms
  cached_resources
  ../../blenkernel
-  ../../blenlib
  ../../blentranslation
  ../../draw
  ../../gpu
@@ -103,7 +102,7 @@ set(LIB
  bf_nodes
  bf_imbuf
  bf_render
-  bf_blenlib
+  PRIVATE bf::blenlib
  bf_blenkernel
 )

--- a/source/blender/depsgraph/CMakeLists.txt
+++ b/source/blender/depsgraph/CMakeLists.txt
@@ -5,7 +5,6 @@
 set(INC
  .
  ../blenkernel
-  ../blenlib
  ../bmesh
  ../draw
  ../functions
@@ -153,6 +152,7 @@ set(SRC

 set(LIB
  bf_blenkernel
+  PRIVATE bf::blenlib
  PRIVATE bf::dna
  PRIVATE bf::intern::atomic
  PRIVATE bf::intern::guardedalloc
--- a/source/blender/draw/CMakeLists.txt
+++ b/source/blender/draw/CMakeLists.txt
@@ -8,7 +8,6 @@ set(INC

  ../blenfont
  ../blenkernel
-  ../blenlib
  ../blenloader
  ../blentranslation
  ../bmesh
@@ -354,7 +353,7 @@ set(SRC

 set(LIB
  bf_blenkernel
-  bf_blenlib
+  PRIVATE bf::blenlib
  PRIVATE bf::dna
  PRIVATE bf::intern::guardedalloc
  bf_realtime_compositor
--- a/source/blender/editors/animation/CMakeLists.txt
+++ b/source/blender/editors/animation/CMakeLists.txt
@@ -5,7 +5,6 @@
 set(INC
  ../include
  ../../blenkernel
-  ../../blenlib
  ../../blentranslation
  ../../depsgraph
  ../../gpu
@@ -45,7 +44,7 @@ set(SRC

 set(LIB
  bf_blenkernel
-  bf_blenlib
+  PRIVATE bf::blenlib
  PRIVATE bf::dna
  PRIVATE bf::intern::guardedalloc
 )
--- a/source/blender/editors/armature/CMakeLists.txt
+++ b/source/blender/editors/armature/CMakeLists.txt
@@ -7,7 +7,6 @@ set(INC
  ../../asset_system
  ../../blenfont
  ../../blenkernel
-  ../../blenlib
  ../../blenloader
  ../../blentranslation
  ../../depsgraph
@@ -48,7 +47,7 @@ set(SRC

 set(LIB
  bf_blenkernel
-  bf_blenlib
+  PRIVATE bf::blenlib
  PRIVATE bf::dna
  PRIVATE bf::intern::guardedalloc
 )
--- a/source/blender/editors/asset/CMakeLists.txt
+++ b/source/blender/editors/asset/CMakeLists.txt
@@ -7,7 +7,6 @@ set(INC
  ../include
  ../../asset_system
  ../../blenkernel
-  ../../blenlib
  ../../blenloader
  ../../blentranslation
  ../../makesrna
@@ -51,6 +50,7 @@ set(SRC

 set(LIB
  bf_blenkernel
+  PRIVATE bf::blenlib
  bf_blenloader
  PRIVATE bf::dna
  PRIVATE bf::intern::guardedalloc
--- a/source/blender/editors/curve/CMakeLists.txt
+++ b/source/blender/editors/curve/CMakeLists.txt
@@ -5,7 +5,6 @@
 set(INC
  ../include
  ../../blenkernel
-  ../../blenlib
  ../../blentranslation
  ../../depsgraph
  ../../gpu
@@ -37,7 +36,7 @@ set(SRC

 set(LIB
  bf_blenkernel
-  bf_blenlib
+  PRIVATE bf::blenlib
  PRIVATE bf::dna
  PRIVATE bf::intern::guardedalloc
  extern_curve_fit_nd
--- a/source/blender/editors/curves/CMakeLists.txt
+++ b/source/blender/editors/curves/CMakeLists.txt
@@ -5,7 +5,6 @@
 set(INC
  ../include
  ../../blenkernel
-  ../../blenlib
  ../../blentranslation
  ../../depsgraph
  ../../functions
@@ -32,7 +31,7 @@ set(SRC

 set(LIB
  bf_blenkernel
-  bf_blenlib
+  PRIVATE bf::blenlib
  PRIVATE bf::dna
  PRIVATE bf::intern::guardedalloc
 )
--- a/source/blender/editors/geometry/CMakeLists.txt
+++ b/source/blender/editors/geometry/CMakeLists.txt
@@ -6,7 +6,6 @@ set(INC
  ../include
  ../../asset_system
  ../../blenkernel
-  ../../blenlib
  ../../blentranslation
  ../../depsgraph
  ../../functions
@@ -32,6 +31,7 @@ set(SRC

 set(LIB
  bf_blenkernel
+  PRIVATE bf::blenlib
  bf_depsgraph
  PRIVATE bf::dna
  bf_editor_object
--- a/source/blender/editors/gizmo_library/CMakeLists.txt
+++ b/source/blender/editors/gizmo_library/CMakeLists.txt
@@ -5,7 +5,6 @@
 set(INC
  ../include
  ../../blenkernel
-  ../../blenlib
  ../../blentranslation
  ../../bmesh
  ../../depsgraph
@@ -42,6 +41,7 @@ set(SRC
 )

 set(LIB
+  PRIVATE bf::blenlib
  PRIVATE bf::dna
  PRIVATE bf::intern::guardedalloc
 )
--- a/source/blender/editors/gpencil_legacy/CMakeLists.txt
+++ b/source/blender/editors/gpencil_legacy/CMakeLists.txt
@@ -6,7 +6,6 @@ set(INC
  ../include
  ../../blenfont
  ../../blenkernel
-  ../../blenlib
  ../../blentranslation
  ../../depsgraph
  ../../gpu
@@ -59,7 +58,7 @@ set(SRC

 set(LIB
  bf_blenkernel
-  bf_blenlib
+  PRIVATE bf::blenlib
  PRIVATE bf::dna
  PRIVATE bf::intern::guardedalloc
 )
--- a/source/blender/editors/grease_pencil/CMakeLists.txt
+++ b/source/blender/editors/grease_pencil/CMakeLists.txt
@@ -5,7 +5,6 @@
 set(INC
  ../include
  ../../blenkernel
-  ../../blenlib
  ../../blentranslation
  ../../depsgraph
  ../../gpu
@@ -30,7 +29,7 @@ set(SRC

 set(LIB
  bf_blenkernel
-  bf_blenlib
+  PRIVATE bf::blenlib
  PRIVATE bf::dna
  PRIVATE bf::intern::guardedalloc
 )
--- a/source/blender/editors/interface/CMakeLists.txt
+++ b/source/blender/editors/interface/CMakeLists.txt
@@ -8,7 +8,6 @@ set(INC
  ../../asset_system
  ../../blenfont
  ../../blenkernel
-  ../../blenlib
  ../../blenloader
  ../../blentranslation
  ../../depsgraph
@@ -96,7 +95,7 @@ set(SRC

 set(LIB
  bf_blenkernel
-  bf_blenlib
+  PRIVATE bf::blenlib
  PRIVATE bf::dna
  bf_editor_datafiles
  PRIVATE bf::intern::guardedalloc
--- a/source/blender/editors/io/CMakeLists.txt
+++ b/source/blender/editors/io/CMakeLists.txt
@@ -5,7 +5,6 @@
 set(INC
  ../include
  ../../blenkernel
-  ../../blenlib
  ../../blentranslation
  ../../bmesh
  ../../depsgraph
@@ -51,7 +50,7 @@ set(SRC

 set(LIB
  bf_blenkernel
-  bf_blenlib
+  PRIVATE bf::blenlib
  PRIVATE bf::dna
  PRIVATE bf::intern::guardedalloc
 )
--- a/source/blender/editors/lattice/CMakeLists.txt
+++ b/source/blender/editors/lattice/CMakeLists.txt
@@ -5,7 +5,6 @@
 set(INC
  ../include
  ../../blenkernel
-  ../../blenlib
  ../../depsgraph
  ../../makesrna
  ../../render
@@ -27,6 +26,7 @@ set(SRC
 )

 set(LIB
+  PRIVATE bf::blenlib
  PRIVATE bf::dna
  PRIVATE bf::intern::guardedalloc
 )
--- a/source/blender/editors/mask/CMakeLists.txt
+++ b/source/blender/editors/mask/CMakeLists.txt
@@ -5,7 +5,6 @@
 set(INC
  ../include
  ../../blenkernel
-  ../../blenlib
  ../../depsgraph
  ../../gpu
  ../../makesrna
@@ -30,6 +29,7 @@ set(SRC
 )

 set(LIB
+  PRIVATE bf::blenlib
  PRIVATE bf::dna
  PRIVATE bf::intern::guardedalloc
 )
--- a/source/blender/editors/mesh/CMakeLists.txt
+++ b/source/blender/editors/mesh/CMakeLists.txt
@@ -7,7 +7,6 @@ set(INC
  ../uvedit
  ../../blenfont
  ../../blenkernel
-  ../../blenlib
  ../../blentranslation
  ../../bmesh
  ../../depsgraph
@@ -63,7 +62,7 @@ set(SRC

 set(LIB
  bf_blenkernel
-  bf_blenlib
+  PRIVATE bf::blenlib
  PRIVATE bf::dna
  PRIVATE bf::intern::guardedalloc
  bf_windowmanager
--- a/source/blender/editors/metaball/CMakeLists.txt
+++ b/source/blender/editors/metaball/CMakeLists.txt
@@ -5,7 +5,6 @@
 set(INC
  ../include
  ../../blenkernel
-  ../../blenlib
  ../../depsgraph
  ../../gpu
  ../../makesrna
@@ -27,6 +26,7 @@ set(SRC
 )

 set(LIB
+  PRIVATE bf::blenlib
  PRIVATE bf::dna
  PRIVATE bf::intern::guardedalloc
 )
--- a/source/blender/editors/object/CMakeLists.txt
+++ b/source/blender/editors/object/CMakeLists.txt
@@ -6,7 +6,6 @@ set(INC
  ../include
  ../../blenfont
  ../../blenkernel
-  ../../blenlib
  ../../blentranslation
  ../../bmesh
  ../../depsgraph
@@ -63,7 +62,7 @@ set(SRC

 set(LIB
  bf_blenkernel
-  bf_blenlib
+  PRIVATE bf::blenlib
  PRIVATE bf::dna
  bf_editor_mesh
  bf_editor_grease_pencil
--- a/source/blender/editors/physics/CMakeLists.txt
+++ b/source/blender/editors/physics/CMakeLists.txt
@@ -5,7 +5,6 @@
 set(INC
  ../include
  ../../blenkernel
-  ../../blenlib
  ../../blentranslation
  ../../depsgraph
  ../../gpu
@@ -39,7 +38,7 @@ set(SRC

 set(LIB
  bf_blenkernel
-  bf_blenlib
+  PRIVATE bf::blenlib
  PRIVATE bf::dna
  PRIVATE bf::intern::guardedalloc
 )
--- a/source/blender/editors/render/CMakeLists.txt
+++ b/source/blender/editors/render/CMakeLists.txt
@@ -5,7 +5,6 @@
 set(INC
  ../include
  ../../blenkernel
-  ../../blenlib
  ../../blenloader
  ../../blentranslation
  ../../bmesh
@@ -35,6 +34,7 @@ set(SRC
 )

 set(LIB
+  PRIVATE bf::blenlib
  PRIVATE bf::dna
  bf_draw
  PRIVATE bf::intern::guardedalloc
--- a/source/blender/editors/scene/CMakeLists.txt
+++ b/source/blender/editors/scene/CMakeLists.txt
@@ -5,7 +5,6 @@
 set(INC
  ../include
  ../../blenkernel
-  ../../blenlib
  ../../blentranslation
  ../../depsgraph
  ../../makesrna
@@ -23,7 +22,7 @@ set(SRC

 set(LIB
  bf_blenkernel
-  bf_blenlib
+  PRIVATE bf::blenlib
  PRIVATE bf::dna
  PRIVATE bf::intern::guardedalloc
 )
--- a/source/blender/editors/screen/CMakeLists.txt
+++ b/source/blender/editors/screen/CMakeLists.txt
@@ -6,7 +6,6 @@ set(INC
  ../include
  ../../blenfont
  ../../blenkernel
-  ../../blenlib
  ../../blenloader
  ../../blentranslation
  ../../bmesh
@@ -43,6 +42,7 @@ set(SRC
 )

 set(LIB
+  PRIVATE bf::blenlib
  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
@@ -6,7 +6,6 @@ set(INC
  ../include
  ../uvedit
  ../../blenkernel
-  ../../blenlib
  ../../blentranslation
  ../../bmesh
  ../../depsgraph
@@ -94,7 +93,7 @@ set(SRC

 set(LIB
  bf_blenkernel
-  bf_blenlib
+  PRIVATE bf::blenlib
  PRIVATE bf::dna
  PRIVATE bf::intern::atomic
  PRIVATE bf::intern::guardedalloc
--- a/source/blender/editors/sound/CMakeLists.txt
+++ b/source/blender/editors/sound/CMakeLists.txt
@@ -5,7 +5,6 @@
 set(INC
  ../include
  ../../blenkernel
-  ../../blenlib
  ../../depsgraph
  ../../makesrna
  ../../sequencer
@@ -26,7 +25,7 @@ set(SRC

 set(LIB
  bf_blenkernel
-  bf_blenlib
+  PRIVATE bf::blenlib
  PRIVATE bf::dna
  PRIVATE bf::intern::guardedalloc
 )
--- a/source/blender/editors/space_action/CMakeLists.txt
+++ b/source/blender/editors/space_action/CMakeLists.txt
@@ -5,7 +5,6 @@
 set(INC
  ../include
  ../../blenkernel
-  ../../blenlib
  ../../blenloader
  ../../blentranslation
  ../../depsgraph
@@ -34,7 +33,7 @@ set(SRC

 set(LIB
  bf_blenkernel
-  bf_blenlib
+  PRIVATE bf::blenlib
  PRIVATE bf::dna
  PRIVATE bf::intern::guardedalloc
 )
--- a/source/blender/editors/space_api/CMakeLists.txt
+++ b/source/blender/editors/space_api/CMakeLists.txt
@@ -7,7 +7,6 @@ set(INC
  ../io
  ../../asset_system
  ../../blenkernel
-  ../../blenlib
  ../../gpu
  ../../makesrna
  ../../windowmanager
@@ -22,6 +21,7 @@ set(SRC
 )

 set(LIB
+  PRIVATE bf::blenlib
  PRIVATE bf::dna
  bf_editor_geometry
  bf_editor_space_action
--- a/source/blender/editors/space_buttons/CMakeLists.txt
+++ b/source/blender/editors/space_buttons/CMakeLists.txt
@@ -5,7 +5,6 @@
 set(INC
  ../include
  ../../blenkernel
-  ../../blenlib
  ../../blenloader
  ../../blentranslation
  ../../gpu
@@ -30,6 +29,7 @@ set(SRC
 )

 set(LIB
+  PRIVATE bf::blenlib
  PRIVATE bf::dna
  PRIVATE bf::intern::guardedalloc
 )
--- a/source/blender/editors/space_clip/CMakeLists.txt
+++ b/source/blender/editors/space_clip/CMakeLists.txt
@@ -6,7 +6,6 @@ set(INC
  ../include
  ../../blenfont
  ../../blenkernel
-  ../../blenlib
  ../../blenloader
  ../../blentranslation
  ../../depsgraph
@@ -49,7 +48,7 @@ set(SRC

 set(LIB
  bf_blenkernel
-  bf_blenlib
+  PRIVATE bf::blenlib
  PRIVATE bf::dna
  PRIVATE bf::intern::guardedalloc
 )
--- a/source/blender/editors/space_console/CMakeLists.txt
+++ b/source/blender/editors/space_console/CMakeLists.txt
@@ -6,7 +6,6 @@ set(INC
  ../include
  ../../blenfont
  ../../blenkernel
-  ../../blenlib
  ../../blenloader
  ../../gpu
  ../../makesrna
@@ -27,7 +26,7 @@ set(SRC

 set(LIB
  bf_blenkernel
-  bf_blenlib
+  PRIVATE bf::blenlib
  PRIVATE bf::dna
  PRIVATE bf::intern::guardedalloc
 )
--- a/source/blender/editors/space_file/CMakeLists.txt
+++ b/source/blender/editors/space_file/CMakeLists.txt
@@ -8,7 +8,6 @@ set(INC
  ../../asset_system
  ../../blenfont
  ../../blenkernel
-  ../../blenlib
  ../../blenloader
  ../../blentranslation
  ../../gpu
@@ -46,6 +45,7 @@ set(SRC

 set(LIB
  bf_blenkernel
+  PRIVATE bf::blenlib
  PRIVATE bf::dna
  PRIVATE bf::intern::guardedalloc
  extern_fmtlib
--- a/source/blender/editors/space_graph/CMakeLists.txt
+++ b/source/blender/editors/space_graph/CMakeLists.txt
@@ -5,7 +5,6 @@
 set(INC
  ../include
  ../../blenkernel
-  ../../blenlib
  ../../blenloader
  ../../blentranslation
  ../../depsgraph
@@ -36,7 +35,7 @@ set(SRC

 set(LIB
  bf_blenkernel
-  bf_blenlib
+  PRIVATE bf::blenlib
  PRIVATE bf::dna
  PRIVATE bf::intern::guardedalloc
 )
--- a/source/blender/editors/space_image/CMakeLists.txt
+++ b/source/blender/editors/space_image/CMakeLists.txt
@@ -6,7 +6,6 @@ set(INC
  ../include
  ../../blenfont
  ../../blenkernel
-  ../../blenlib
  ../../blenloader
  ../../blentranslation
  ../../bmesh
@@ -40,7 +39,7 @@ set(SRC

 set(LIB
  bf_blenkernel
-  bf_blenlib
+  PRIVATE bf::blenlib
  PRIVATE bf::dna
  bf_editor_uvedit
  PRIVATE bf::intern::guardedalloc
--- a/source/blender/editors/space_info/CMakeLists.txt
+++ b/source/blender/editors/space_info/CMakeLists.txt
@@ -6,7 +6,6 @@ set(INC
  ../include
  ../../blenfont
  ../../blenkernel
-  ../../blenlib
  ../../blenloader
  ../../blentranslation
  ../../bmesh
@@ -36,6 +35,7 @@ set(SRC
 )

 set(LIB
+  PRIVATE bf::blenlib
  PRIVATE bf::dna
  PRIVATE bf::intern::guardedalloc
 )
--- a/source/blender/editors/space_nla/CMakeLists.txt
+++ b/source/blender/editors/space_nla/CMakeLists.txt
@@ -5,7 +5,6 @@
 set(INC
  ../include
  ../../blenkernel
-  ../../blenlib
  ../../blenloader
  ../../blentranslation
  ../../depsgraph
@@ -34,7 +33,7 @@ set(SRC

 set(LIB
  bf_blenkernel
-  bf_blenlib
+  PRIVATE bf::blenlib
  PRIVATE bf::dna
  PRIVATE bf::intern::guardedalloc
 )
--- a/source/blender/editors/space_node/CMakeLists.txt
+++ b/source/blender/editors/space_node/CMakeLists.txt
@@ -7,7 +7,6 @@ set(INC
  ../../asset_system
  ../../blenfont
  ../../blenkernel
-  ../../blenlib
  ../../blenloader
  ../../blentranslation
  ../../compositor
@@ -53,7 +52,7 @@ set(SRC

 set(LIB
  bf_blenkernel
-  bf_blenlib
+  PRIVATE bf::blenlib
  PRIVATE bf::dna
  bf_editor_screen
  PRIVATE bf::intern::guardedalloc
--- a/source/blender/editors/space_outliner/CMakeLists.txt
+++ b/source/blender/editors/space_outliner/CMakeLists.txt
@@ -5,7 +5,6 @@
 set(INC
  ../include
  ../../blenkernel
-  ../../blenlib
  ../../blenloader
  ../../blentranslation
  ../../depsgraph
@@ -109,7 +108,7 @@ set(SRC

 set(LIB
  bf_blenkernel
-  bf_blenlib
+  PRIVATE bf::blenlib
  PRIVATE bf::dna
  bf_editor_undo
  PRIVATE bf::intern::guardedalloc
--- a/source/blender/editors/space_script/CMakeLists.txt
+++ b/source/blender/editors/space_script/CMakeLists.txt
@@ -5,7 +5,6 @@
 set(INC
  ../include
  ../../blenkernel
-  ../../blenlib
  ../../blenloader
  ../../blentranslation
  ../../gpu
@@ -26,6 +25,7 @@ set(SRC
 )

 set(LIB
+  PRIVATE bf::blenlib
  PRIVATE bf::dna
  PRIVATE bf::intern::guardedalloc
 )
--- a/source/blender/editors/space_sequencer/CMakeLists.txt
+++ b/source/blender/editors/space_sequencer/CMakeLists.txt
@@ -6,7 +6,6 @@ set(INC
  ../include
  ../../blenfont
  ../../blenkernel
-  ../../blenlib
  ../../blenloader
  ../../blentranslation
  ../../depsgraph
@@ -49,6 +48,7 @@ set(SRC
 )

 set(LIB
+  PRIVATE bf::blenlib
  PRIVATE bf::dna
  bf_editor_interface
  bf_editor_util
--- a/source/blender/editors/space_spreadsheet/CMakeLists.txt
+++ b/source/blender/editors/space_spreadsheet/CMakeLists.txt
@@ -6,7 +6,6 @@ set(INC
  ../include
  ../../blenfont
  ../../blenkernel
-  ../../blenlib
  ../../blenloader
  ../../blentranslation
  ../../bmesh
@@ -52,6 +51,7 @@ set(SRC
 )

 set(LIB
+  PRIVATE bf::blenlib
  PRIVATE bf::dna
  PRIVATE bf::intern::guardedalloc
 )
--- a/source/blender/editors/space_statusbar/CMakeLists.txt
+++ b/source/blender/editors/space_statusbar/CMakeLists.txt
@@ -5,7 +5,6 @@
 set(INC
  ../include
  ../../blenkernel
-  ../../blenlib
  ../../blenloader
  ../../blentranslation
  ../../gpu
@@ -25,7 +24,7 @@ set(SRC

 set(LIB
  bf_blenkernel
-  bf_blenlib
+  PRIVATE bf::blenlib
  PRIVATE bf::dna
  PRIVATE bf::intern::guardedalloc
 )
--- a/source/blender/editors/space_text/CMakeLists.txt
+++ b/source/blender/editors/space_text/CMakeLists.txt
@@ -6,7 +6,6 @@ set(INC
  ../include
  ../../blenfont
  ../../blenkernel
-  ../../blenlib
  ../../blenloader
  ../../blentranslation
  ../../gpu
@@ -37,7 +36,7 @@ set(SRC

 set(LIB
  bf_blenkernel
-  bf_blenlib
+  PRIVATE bf::blenlib
  PRIVATE bf::dna
  PRIVATE bf::intern::guardedalloc
 )
--- a/source/blender/editors/space_topbar/CMakeLists.txt
+++ b/source/blender/editors/space_topbar/CMakeLists.txt
@@ -5,7 +5,6 @@
 set(INC
  ../include
  ../../blenkernel
-  ../../blenlib
  ../../blenloader
  ../../blentranslation
  ../../gpu
@@ -24,6 +23,7 @@ set(SRC
 )

 set(LIB
+  PRIVATE bf::blenlib
  PRIVATE bf::dna
  PRIVATE bf::intern::guardedalloc
 )
--- a/source/blender/editors/space_userpref/CMakeLists.txt
+++ b/source/blender/editors/space_userpref/CMakeLists.txt
@@ -5,7 +5,6 @@
 set(INC
  ../include
  ../../blenkernel
-  ../../blenlib
  ../../blenloader
  ../../makesrna
  ../../windowmanager
@@ -24,6 +23,7 @@ set(SRC
 )

 set(LIB
+  PRIVATE bf::blenlib
  PRIVATE bf::dna
  PRIVATE bf::intern::guardedalloc
 )
--- a/source/blender/editors/space_view3d/CMakeLists.txt
+++ b/source/blender/editors/space_view3d/CMakeLists.txt
@@ -7,7 +7,6 @@ set(INC
  ../../asset_system
  ../../blenfont
  ../../blenkernel
-  ../../blenlib
  ../../blenloader
  ../../blentranslation
  ../../bmesh
@@ -72,6 +71,7 @@ set(SRC
 )

 set(LIB
+  PRIVATE bf::blenlib
  PRIVATE bf::dna
  bf_editor_curves
  bf_editor_lattice
--- a/source/blender/editors/transform/CMakeLists.txt
+++ b/source/blender/editors/transform/CMakeLists.txt
@@ -6,7 +6,6 @@ set(INC
  ../include
  ../../blenfont
  ../../blenkernel
-  ../../blenlib
  ../../blentranslation
  ../../bmesh
  ../../depsgraph
@@ -118,7 +117,7 @@ set(SRC
 set(LIB
  bf_blenfont
  bf_blenkernel
-  bf_blenlib
+  PRIVATE bf::blenlib
  bf_bmesh
  PRIVATE bf::dna
  bf_editor_mask
--- a/source/blender/editors/undo/CMakeLists.txt
+++ b/source/blender/editors/undo/CMakeLists.txt
@@ -6,7 +6,6 @@ set(INC
  ../include
  ../../asset_system
  ../../blenkernel
-  ../../blenlib
  ../../blenloader
  ../../blentranslation
  ../../makesrna
@@ -28,7 +27,7 @@ set(SRC

 set(LIB
  bf_blenkernel
-  bf_blenlib
+  PRIVATE bf::blenlib
  PRIVATE bf::dna
  bf_editor_curve
  bf_editor_curves
--- a/source/blender/editors/util/CMakeLists.txt
+++ b/source/blender/editors/util/CMakeLists.txt
@@ -8,7 +8,6 @@ set(INC
  ../../asset_system
  ../../blenfont
  ../../blenkernel
-  ../../blenlib
  ../../blentranslation
  ../../bmesh
  ../../depsgraph
@@ -108,6 +107,7 @@ set(SRC
 )

 set(LIB
+  PRIVATE bf::blenlib
  PRIVATE bf::dna
  PRIVATE bf::intern::guardedalloc
 )
--- a/source/blender/editors/uvedit/CMakeLists.txt
+++ b/source/blender/editors/uvedit/CMakeLists.txt
@@ -5,7 +5,6 @@
 set(INC
  ../include
  ../../blenkernel
-  ../../blenlib
  ../../blentranslation
  ../../bmesh
  ../../depsgraph
@@ -39,6 +38,7 @@ set(SRC
 )

 set(LIB
+  PRIVATE bf::blenlib
  bf_bmesh
  PRIVATE bf::dna
  PRIVATE bf::intern::guardedalloc
--- a/source/blender/freestyle/CMakeLists.txt
+++ b/source/blender/freestyle/CMakeLists.txt
@@ -530,6 +530,7 @@ set(SRC
 )

 set(LIB
+  PRIVATE bf::blenlib
  PRIVATE bf::dna
  PRIVATE bf::intern::guardedalloc
  bf_python_mathutils
@@ -541,7 +542,6 @@ set(LIB
 set(INC
  .
  ../blenkernel
-  ../blenlib
  ../blentranslation
  ../depsgraph
  ../imbuf
--- a/source/blender/functions/CMakeLists.txt
+++ b/source/blender/functions/CMakeLists.txt
@@ -4,7 +4,6 @@

 set(INC
  .
-  ../blenlib
 )

 set(INC_SYS
@@ -48,7 +47,7 @@ set(SRC
 )

 set(LIB
-  bf_blenlib
+  PRIVATE bf::blenlib
  PRIVATE bf::dna
  PRIVATE bf::intern::guardedalloc
 )
--- a/source/blender/geometry/CMakeLists.txt
+++ b/source/blender/geometry/CMakeLists.txt
@@ -5,7 +5,6 @@
 set(INC
  .
  ../blenkernel
-  ../blenlib
  ../blentranslation
  ../functions
  ../makesrna
@@ -58,7 +57,7 @@ set(SRC

 set(LIB
  bf_blenkernel
-  bf_blenlib
+  PRIVATE bf::blenlib
  PRIVATE bf::dna
  PRIVATE bf::intern::guardedalloc
 )
--- a/source/blender/gpencil_modifiers_legacy/CMakeLists.txt
+++ b/source/blender/gpencil_modifiers_legacy/CMakeLists.txt
@@ -7,7 +7,6 @@ set(INC
  intern
  ../blenfont
  ../blenkernel
-  ../blenlib
  ../blentranslation
  ../bmesh
  ../depsgraph
@@ -89,6 +88,7 @@ list(APPEND LIB
 endif()

 set(LIB
+  PRIVATE bf::blenlib
  PRIVATE bf::dna
  PRIVATE bf::intern::guardedalloc
 )
--- a/source/blender/gpu/CMakeLists.txt
+++ b/source/blender/gpu/CMakeLists.txt
@@ -17,7 +17,6 @@ set(INC
  opengl
  vulkan
  ../blenkernel
-  ../blenlib
  ../bmesh
  ../draw
  ../imbuf
@@ -324,6 +323,7 @@ set(METAL_SRC
 )

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

 set(INC_SYS
@@ -22,6 +21,7 @@ set(SRC
 )

 set(LIB
+  PRIVATE bf::blenlib
  PRIVATE bf::dna
  PRIVATE bf::intern::guardedalloc
 )
--- a/source/blender/imbuf/CMakeLists.txt
+++ b/source/blender/imbuf/CMakeLists.txt
@@ -5,7 +5,6 @@
 set(INC
  .
  ../blenkernel
-  ../blenlib
  ../blenloader
  ../gpu
  ../makesrna
@@ -75,7 +74,7 @@ set(SRC

 set(LIB
  bf_blenkernel
-  bf_blenlib
+  PRIVATE bf::blenlib
  bf_blenloader
  PRIVATE bf::dna
  bf_imbuf_openimageio
--- a/source/blender/imbuf/intern/cineon/CMakeLists.txt
+++ b/source/blender/imbuf/intern/cineon/CMakeLists.txt
@@ -7,7 +7,6 @@ set(INC
  ..
  ../..
  ../../../blenkernel
-  ../../../blenlib
 )

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

 set(LIB
+  PRIVATE bf::blenlib
  PRIVATE bf::dna
  PRIVATE bf::intern::guardedalloc
 )
--- a/source/blender/imbuf/intern/oiio/CMakeLists.txt
+++ b/source/blender/imbuf/intern/oiio/CMakeLists.txt
@@ -7,7 +7,6 @@ set(INC
  ..
  ../..
  ../../../blenkernel
-  ../../../blenlib
  ../../../../../intern/utfconv
 )

@@ -26,6 +25,7 @@ set(SRC
 set(LIB
  ${OPENIMAGEIO_LIBRARIES}
  ${PUGIXML_LIBRARIES}
+  PRIVATE bf::blenlib
  PRIVATE bf::dna
  PRIVATE bf::intern::guardedalloc
 )
--- a/source/blender/imbuf/intern/openexr/CMakeLists.txt
+++ b/source/blender/imbuf/intern/openexr/CMakeLists.txt
@@ -7,7 +7,6 @@ set(INC
  ..
  ../..
  ../../../blenkernel
-  ../../../blenlib
  ../../../../../intern/utfconv
 )

@@ -21,6 +20,7 @@ set(SRC
 )

 set(LIB
+  PRIVATE bf::blenlib
  PRIVATE bf::dna
  PRIVATE bf::intern::guardedalloc
 )
--- a/source/blender/io/alembic/CMakeLists.txt
+++ b/source/blender/io/alembic/CMakeLists.txt
@@ -6,7 +6,6 @@ set(INC
  .
  ../common
  ../../blenkernel
-  ../../blenlib
  ../../blenloader
  ../../blentranslation
  ../../bmesh
@@ -90,7 +89,7 @@ set(SRC

 set(LIB
  bf_blenkernel
-  bf_blenlib
+  PRIVATE bf::blenlib
  PRIVATE bf::dna
  PRIVATE bf::intern::guardedalloc
  bf_io_common
--- a/source/blender/io/avi/CMakeLists.txt
+++ b/source/blender/io/avi/CMakeLists.txt
@@ -4,7 +4,6 @@

 set(INC
  .
-  ../../blenlib
  ../../imbuf
 )

@@ -31,6 +30,7 @@ set(SRC

 set(LIB
  ${JPEG_LIBRARIES}
+  PRIVATE bf::blenlib
  PRIVATE bf::dna
  PRIVATE bf::intern::guardedalloc
 )
--- a/source/blender/io/collada/CMakeLists.txt
+++ b/source/blender/io/collada/CMakeLists.txt
@@ -22,7 +22,6 @@ unset(OPENCOLLADA_ANIMATION_CLIP CACHE)
 set(INC
  .
  ../../blenkernel
-  ../../blenlib
  ../../blentranslation
  ../../depsgraph
  ../../editors/include
@@ -115,6 +114,7 @@ set(LIB
  ${OPENCOLLADA_LIBRARIES}
  ${PCRE_LIBRARIES}
  ${XML2_LIBRARIES}
+  PRIVATE bf::blenlib
  PRIVATE bf::dna
  PRIVATE bf::intern::guardedalloc
 )
--- a/source/blender/io/common/CMakeLists.txt
+++ b/source/blender/io/common/CMakeLists.txt
@@ -5,7 +5,6 @@
 set(INC
  .
  ../../blenkernel
-  ../../blenlib
  ../../depsgraph
  ../../makesrna
 )
@@ -32,7 +31,7 @@ set(SRC

 set(LIB
  bf_blenkernel
-  bf_blenlib
+  PRIVATE bf::blenlib
  PRIVATE bf::dna
  PRIVATE bf::intern::guardedalloc
 )
--- a/source/blender/io/gpencil/CMakeLists.txt
+++ b/source/blender/io/gpencil/CMakeLists.txt
@@ -6,7 +6,6 @@ set(INC
  .
  ../common
  ../../blenkernel
-  ../../blenlib
  ../../blenloader
  ../../bmesh
  ../../depsgraph
@@ -39,7 +38,7 @@ set(SRC

 set(LIB
  bf_blenkernel
-  bf_blenlib
+  PRIVATE bf::blenlib
  PRIVATE bf::dna
  PRIVATE bf::intern::guardedalloc
  bf_io_common
--- a/source/blender/io/ply/CMakeLists.txt
+++ b/source/blender/io/ply/CMakeLists.txt
@@ -9,7 +9,6 @@ set(INC
  intern
  ../common
  ../../blenkernel
-  ../../blenlib
  ../../bmesh
  ../../depsgraph
  ../../geometry
@@ -54,6 +53,7 @@ set(SRC

 set(LIB
  bf_blenkernel
+  PRIVATE bf::blenlib
  PRIVATE bf::dna
  PRIVATE bf::intern::guardedalloc
  bf_io_common
--- a/source/blender/io/stl/CMakeLists.txt
+++ b/source/blender/io/stl/CMakeLists.txt
@@ -7,7 +7,6 @@ set(INC
  importer
  ../common
  ../../blenkernel
-  ../../blenlib
  ../../bmesh
  ../../bmesh/intern
  ../../depsgraph
@@ -37,6 +36,7 @@ set(SRC

 set(LIB
  bf_blenkernel
+  PRIVATE bf::blenlib
  PRIVATE bf::dna
  PRIVATE bf::intern::guardedalloc
  bf_io_common
--- a/source/blender/io/usd/CMakeLists.txt
+++ b/source/blender/io/usd/CMakeLists.txt
@@ -47,7 +47,6 @@ set(INC
  .
  ../common
  ../../blenkernel
-  ../../blenlib
  ../../blenloader
  ../../blentranslation
  ../../bmesh
@@ -127,7 +126,7 @@ set(SRC

 set(LIB
  bf_blenkernel
-  bf_blenlib
+  PRIVATE bf::blenlib
  PRIVATE bf::dna
  bf_imbuf
  PRIVATE bf::intern::guardedalloc
--- a/source/blender/io/wavefront_obj/CMakeLists.txt
+++ b/source/blender/io/wavefront_obj/CMakeLists.txt
@@ -8,7 +8,6 @@ set(INC
  importer
  ../common
  ../../blenkernel
-  ../../blenlib
  ../../bmesh
  ../../bmesh/intern
  ../../depsgraph
@@ -57,6 +56,7 @@ set(SRC

 set(LIB
  bf_blenkernel
+  PRIVATE bf::blenlib
  PRIVATE bf::dna
  PRIVATE bf::intern::guardedalloc
  bf_io_common
--- a/source/blender/modifiers/CMakeLists.txt
+++ b/source/blender/modifiers/CMakeLists.txt
@@ -7,7 +7,6 @@ set(INC
  intern
  ../blenfont
  ../blenkernel
-  ../blenlib
  ../blenloader
  ../blentranslation
  ../bmesh
@@ -109,7 +108,7 @@ set(SRC

 set(LIB
  bf_blenkernel
-  bf_blenlib
+  PRIVATE bf::blenlib
  PUBLIC bf::dna
  PRIVATE bf::intern::guardedalloc
 )
--- a/source/blender/nodes/CMakeLists.txt
+++ b/source/blender/nodes/CMakeLists.txt
@@ -18,7 +18,6 @@ set(INC
  texture
  ../editors/include
  ../blenkernel
-  ../blenlib
  ../blentranslation
  ../bmesh
  ../depsgraph
@@ -80,6 +79,7 @@ set(SRC
 )

 set(LIB
+  PRIVATE bf::blenlib
  bf_bmesh
  PRIVATE bf::dna
  bf_functions
--- a/source/blender/nodes/composite/CMakeLists.txt
+++ b/source/blender/nodes/composite/CMakeLists.txt
@@ -8,7 +8,6 @@ set(INC
  ../intern
  ../../editors/include
  ../../blenkernel
-  ../../blenlib
  ../../blentranslation
  ../../depsgraph
  ../../functions
@@ -128,6 +127,7 @@ set(SRC
 )

 set(LIB
+  PRIVATE bf::blenlib
  PRIVATE bf::dna
  PRIVATE bf::intern::guardedalloc
  bf_realtime_compositor
--- a/source/blender/nodes/function/CMakeLists.txt
+++ b/source/blender/nodes/function/CMakeLists.txt
@@ -7,7 +7,6 @@ set(INC
  ..
  ../intern
  ../../blenkernel
-  ../../blenlib
  ../../blentranslation
  ../../editors/include
  ../../functions
@@ -46,6 +45,7 @@ set(SRC
 )

 set(LIB
+  PRIVATE bf::blenlib
  PRIVATE bf::dna
  bf_functions
  PRIVATE bf::intern::guardedalloc
--- a/source/blender/nodes/geometry/CMakeLists.txt
+++ b/source/blender/nodes/geometry/CMakeLists.txt
@@ -8,7 +8,6 @@ set(INC
  ../intern
  ../../editors/include
  ../../blenkernel
-  ../../blenlib
  ../../blentranslation
  ../../bmesh
  ../../depsgraph
@@ -199,6 +198,7 @@ set(SRC
 )

 set(LIB
+  PRIVATE bf::blenlib
  bf_bmesh
  PRIVATE bf::dna
  bf_functions
--- a/source/blender/nodes/shader/CMakeLists.txt
+++ b/source/blender/nodes/shader/CMakeLists.txt
@@ -7,7 +7,6 @@ set(INC
  ..
  ../intern
  ../../blenkernel
-  ../../blenlib
  ../../blentranslation
  ../../depsgraph
  ../../editors/include
@@ -127,6 +126,7 @@ set(SRC
 )

 set(LIB
+  PRIVATE bf::blenlib
  PRIVATE bf::dna
  bf_functions
  PRIVATE bf::intern::guardedalloc
--- a/source/blender/nodes/texture/CMakeLists.txt
+++ b/source/blender/nodes/texture/CMakeLists.txt
@@ -8,7 +8,6 @@ set(INC
  ../intern
  ../../editors/include
  ../../blenkernel
-  ../../blenlib
  ../../blentranslation
  ../../depsgraph
  ../../imbuf
@@ -59,6 +58,7 @@ set(SRC
 )

 set(LIB
+  PRIVATE bf::blenlib
  PRIVATE bf::dna
  PRIVATE bf::intern::guardedalloc
  bf_nodes
--- a/source/blender/python/bmesh/CMakeLists.txt
+++ b/source/blender/python/bmesh/CMakeLists.txt
@@ -5,7 +5,6 @@
 set(INC
  .
  ../../blenkernel
-  ../../blenlib
  ../../bmesh
  ../../depsgraph
 )
@@ -38,7 +37,7 @@ set(SRC

 set(LIB
  bf_blenkernel
-  bf_blenlib
+  PRIVATE bf::blenlib
  PRIVATE bf::dna
  PRIVATE bf::intern::guardedalloc
  bf_python_mathutils
--- a/source/blender/python/generic/CMakeLists.txt
+++ b/source/blender/python/generic/CMakeLists.txt
@@ -5,7 +5,6 @@
 set(INC
  .
  ../../blenkernel
-  ../../blenlib
  ../../gpu
  ../../makesrna
  ../../../../intern/clog
@@ -44,6 +43,7 @@ set(LIB
  ${Epoxy_LIBRARIES}
  ${PYTHON_LINKFLAGS}
  ${PYTHON_LIBRARIES}
+  PRIVATE bf::blenlib
  PRIVATE bf::dna
  PRIVATE bf::intern::guardedalloc
 )
--- a/source/blender/python/gpu/CMakeLists.txt
+++ b/source/blender/python/gpu/CMakeLists.txt
@@ -5,7 +5,6 @@
 set(INC
  .
  ../../blenkernel
-  ../../blenlib
  ../../editors/include
  ../../gpu
  ../../imbuf
@@ -61,6 +60,7 @@ set(LIB
  ${Epoxy_LIBRARIES}
  ${PYTHON_LINKFLAGS}
  ${PYTHON_LIBRARIES}
+  PRIVATE bf::blenlib
  PRIVATE bf::dna
  PRIVATE bf::intern::guardedalloc
 )
--- a/source/blender/python/intern/CMakeLists.txt
+++ b/source/blender/python/intern/CMakeLists.txt
@@ -5,7 +5,6 @@
 set(INC
  ..
  ../../blenkernel
-  ../../blenlib
  ../../blenloader
  ../../blentranslation
  ../../depsgraph
@@ -121,6 +120,7 @@ set(SRC
 )

 set(LIB
+  PRIVATE bf::blenlib
  PRIVATE bf::dna
  bf_editor_animation
  bf_editor_interface
--- a/source/blender/python/mathutils/CMakeLists.txt
+++ b/source/blender/python/mathutils/CMakeLists.txt
@@ -5,7 +5,6 @@
 set(INC
  .
  ../../blenkernel
-  ../../blenlib
  ../../bmesh
  ../../depsgraph
  ../../imbuf
@@ -42,7 +41,7 @@ set(SRC
 )

 set(LIB
-  bf_blenlib
+  PRIVATE bf::blenlib
  PRIVATE bf::dna
  bf_imbuf
  PRIVATE bf::intern::guardedalloc
--- a/source/blender/render/CMakeLists.txt
+++ b/source/blender/render/CMakeLists.txt
@@ -7,7 +7,6 @@ set(INC
  .
  intern
  ../blenkernel
-  ../blenlib
  ../blentranslation
  ../compositor/realtime_compositor
  ../compositor/realtime_compositor/cached_resources
@@ -58,6 +57,7 @@ set(SRC
 )

 set(LIB
+  PRIVATE bf::blenlib
  PRIVATE bf::dna
  PRIVATE bf::intern::guardedalloc
  bf_realtime_compositor
--- a/source/blender/sequencer/CMakeLists.txt
+++ b/source/blender/sequencer/CMakeLists.txt
@@ -7,7 +7,6 @@ set(INC
  intern
  ../blenfont
  ../blenkernel
-  ../blenlib
  ../blenloader
  ../blentranslation
  ../depsgraph
@@ -85,7 +84,7 @@ set(SRC

 set(LIB
  bf_blenkernel
-  bf_blenlib
+  PRIVATE bf::blenlib
  PRIVATE bf::dna
  PRIVATE bf::intern::atomic
  PRIVATE bf::intern::guardedalloc
--- a/source/blender/shader_fx/CMakeLists.txt
+++ b/source/blender/shader_fx/CMakeLists.txt
@@ -7,7 +7,6 @@ set(INC
  intern
  ../blenfont
  ../blenkernel
-  ../blenlib
  ../blentranslation
  ../bmesh
  ../depsgraph
@@ -44,6 +43,7 @@ set(SRC
 )

 set(LIB
+  PRIVATE bf::blenlib
  PRIVATE bf::dna
  PRIVATE bf::intern::guardedalloc
 )
--- a/source/blender/simulation/CMakeLists.txt
+++ b/source/blender/simulation/CMakeLists.txt
@@ -6,7 +6,6 @@ set(INC
  .
  intern
  ../blenkernel
-  ../blenlib
  ../depsgraph
  ../functions
  ../imbuf
@@ -33,6 +32,7 @@ set(SRC

 set(LIB
  bf_blenkernel
+  PRIVATE bf::blenlib
  PRIVATE bf::dna
  PRIVATE bf::intern::guardedalloc
 )
--- a/source/blender/windowmanager/CMakeLists.txt
+++ b/source/blender/windowmanager/CMakeLists.txt
@@ -9,7 +9,6 @@ set(INC
  ../asset_system
  ../blenfont
  ../blenkernel
-  ../blenlib
  ../blenloader
  ../blentranslation
  ../compositor
@@ -98,6 +97,7 @@ set(SRC
 )

 set(LIB
+  PRIVATE bf::blenlib
  PRIVATE bf::dna
  bf_editor_screen
  PRIVATE bf::intern::guardedalloc
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -5,7 +5,6 @@
 set(INC
  ../../intern/clog
  ../blender/blenkernel
-  ../blender/blenlib
  ../blender/depsgraph
  ../blender/editors/include
  ../blender/gpu
@@ -18,6 +17,7 @@ set(INC
 )

 set(LIB
+  PRIVATE bf::blenlib
  PRIVATE bf::dna
  PRIVATE bf::intern::guardedalloc
  bf_windowmanager