Cleanup: CMake: Modernize bf_blenkernel dependencies

Pretty straightforward - Remove any bf_blenkernel 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/132282
2024-12-23 20:08:37 +01:00
parent 25f4a496ea
commit a7c39896c6
94 changed files with 95 additions and 145 deletions
--- a/intern/cycles/blender/CMakeLists.txt
+++ b/intern/cycles/blender/CMakeLists.txt
@@ -6,7 +6,6 @@ set(INC
  ..
  ../../mikktspace
  ../../../source/blender/makesrna
-  ../../../source/blender/blenkernel
  ../../../source/blender/gpu
  ../../../source/blender/render
  ${CMAKE_BINARY_DIR}/source/blender/makesrna/intern
@@ -58,6 +57,7 @@ set(SRC
 )

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

-  ../blenkernel
  ../blentranslation
  ../editors/include
  ../makesrna
@@ -61,7 +60,7 @@ set(SRC
 )

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

 set(INC_SYS
@@ -46,7 +45,7 @@ set(SRC
 )

 set(LIB
-  bf_blenkernel
+  PRIVATE bf::blenkernel
  PRIVATE bf::blenlib
  PRIVATE bf::dna
  PRIVATE bf::intern::clog
--- a/source/blender/blenfont/CMakeLists.txt
+++ b/source/blender/blenfont/CMakeLists.txt
@@ -4,7 +4,6 @@

 set(INC
  PUBLIC .
-  ../blenkernel
  ../blentranslation
  ../gpu
  ../imbuf
@@ -29,6 +28,7 @@ set(SRC
 )

 set(LIB
+  PRIVATE bf::blenkernel
  PRIVATE bf::blenlib
  PRIVATE bf::dna
  bf_gpu
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: GPL-2.0-or-later

 set(INC
-  .
+  PUBLIC .
  ../asset_system
  ../blenloader
  ../blentranslation
@@ -806,6 +806,7 @@ endif()
 # 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)
--- a/source/blender/blenloader/CMakeLists.txt
+++ b/source/blender/blenloader/CMakeLists.txt
@@ -4,7 +4,6 @@

 set(INC
  .
-  ../blenkernel
  ../blentranslation
  ../draw
  ../editors/include
@@ -59,7 +58,7 @@ set(SRC

 set(LIB
  PRIVATE bf::animrig
-  bf_blenkernel
+  PRIVATE bf::blenkernel
  PRIVATE bf::blenlib
  PRIVATE bf::bmesh
  PRIVATE bf::depsgraph
--- a/source/blender/blentranslation/CMakeLists.txt
+++ b/source/blender/blentranslation/CMakeLists.txt
@@ -4,7 +4,6 @@

 set(INC
  .
-  ../blenkernel
  ../imbuf
  ../makesrna
  ../../../intern/locale
@@ -22,7 +21,7 @@ set(SRC
 )

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

 set(INC
  PUBLIC .
-  ../blenkernel
  ../blentranslation
  ../../../intern/eigen
  ../../../extern/rangetree
@@ -164,7 +163,7 @@ set(SRC
 )

 set(LIB
-  bf_blenkernel
+  PRIVATE bf::blenkernel
  PRIVATE bf::blenlib
  PRIVATE bf::depsgraph
  PRIVATE bf::dna
--- a/source/blender/compositor/CMakeLists.txt
+++ b/source/blender/compositor/CMakeLists.txt
@@ -7,7 +7,6 @@ set(INC
  algorithms
  cached_resources
  utilities
-  ../blenkernel
  ../blentranslation
  ../functions
  ../gpu
@@ -148,7 +147,7 @@ set(SRC
 )

 set(LIB
-  bf_blenkernel
+  PRIVATE bf::blenkernel
  bf_functions
  bf_gpu
  bf_imbuf
--- a/source/blender/depsgraph/CMakeLists.txt
+++ b/source/blender/depsgraph/CMakeLists.txt
@@ -5,7 +5,6 @@
 set(INC
  PUBLIC .
  ../animrig
-  ../blenkernel
  ../draw
  ../functions
  ../makesrna
@@ -151,7 +150,7 @@ set(SRC
 )

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

-  ../blenkernel
  ../blenloader
  ../blentranslation
  ../editors/include
@@ -304,7 +303,7 @@ set(SRC

 set(LIB
  PRIVATE bf::blenfont
-  bf_blenkernel
+  PRIVATE bf::blenkernel
  PRIVATE bf::blenlib
  PRIVATE bf::bmesh
  PRIVATE bf::depsgraph
--- a/source/blender/editors/animation/CMakeLists.txt
+++ b/source/blender/editors/animation/CMakeLists.txt
@@ -4,7 +4,6 @@

 set(INC
  ../include
-  ../../blenkernel
  ../../blentranslation
  ../../gpu
  ../../makesrna
@@ -42,7 +41,7 @@ set(SRC
 )

 set(LIB
-  bf_blenkernel
+  PRIVATE bf::blenkernel
  PRIVATE bf::animrig
  PRIVATE bf::blenlib
  PRIVATE bf::depsgraph
--- a/source/blender/editors/armature/CMakeLists.txt
+++ b/source/blender/editors/armature/CMakeLists.txt
@@ -5,7 +5,6 @@
 set(INC
  ../include
  ../../asset_system
-  ../../blenkernel
  ../../blenloader
  ../../blentranslation
  ../../gpu
@@ -45,7 +44,7 @@ set(SRC
 set(LIB
  PRIVATE bf::animrig
  PRIVATE bf::blenfont
-  bf_blenkernel
+  PRIVATE bf::blenkernel
  PRIVATE bf::blenlib
  PRIVATE bf::depsgraph
  PRIVATE bf::dna
--- a/source/blender/editors/asset/CMakeLists.txt
+++ b/source/blender/editors/asset/CMakeLists.txt
@@ -6,7 +6,6 @@ set(INC
  .
  ../include
  ../../asset_system
-  ../../blenkernel
  ../../blenloader
  ../../blentranslation
  ../../makesrna
@@ -57,7 +56,7 @@ set(SRC
 )

 set(LIB
-  bf_blenkernel
+  PRIVATE bf::blenkernel
  PRIVATE bf::blenlib
  bf_blenloader
  PRIVATE bf::dna
--- a/source/blender/editors/curve/CMakeLists.txt
+++ b/source/blender/editors/curve/CMakeLists.txt
@@ -4,7 +4,6 @@

 set(INC
  ../include
-  ../../blenkernel
  ../../blentranslation
  ../../gpu
  ../../makesrna
@@ -32,7 +31,7 @@ set(SRC
 )

 set(LIB
-  bf_blenkernel
+  PRIVATE bf::blenkernel
  PRIVATE bf::animrig
  PRIVATE bf::blenlib
  PRIVATE bf::depsgraph
--- a/source/blender/editors/curves/CMakeLists.txt
+++ b/source/blender/editors/curves/CMakeLists.txt
@@ -4,7 +4,6 @@

 set(INC
  ../include
-  ../../blenkernel
  ../../blentranslation
  ../../functions
  ../../geometry
@@ -34,7 +33,7 @@ set(SRC
 )

 set(LIB
-  bf_blenkernel
+  PRIVATE bf::blenkernel
  PRIVATE bf::blenlib
  PRIVATE bf::bmesh
  PRIVATE bf::depsgraph
--- a/source/blender/editors/geometry/CMakeLists.txt
+++ b/source/blender/editors/geometry/CMakeLists.txt
@@ -5,7 +5,6 @@
 set(INC
  ../include
  ../../asset_system
-  ../../blenkernel
  ../../blentranslation
  ../../functions
  ../../makesrna
@@ -29,7 +28,7 @@ set(SRC
 )

 set(LIB
-  bf_blenkernel
+  PRIVATE bf::blenkernel
  PRIVATE bf::blenlib
  PRIVATE bf::bmesh
  PRIVATE bf::depsgraph
--- a/source/blender/editors/gizmo_library/CMakeLists.txt
+++ b/source/blender/editors/gizmo_library/CMakeLists.txt
@@ -4,7 +4,6 @@

 set(INC
  ../include
-  ../../blenkernel
  ../../blentranslation
  ../../gpu
  ../../makesrna
@@ -38,6 +37,7 @@ set(SRC
 )

 set(LIB
+  PRIVATE bf::blenkernel
  PRIVATE bf::blenlib
  PRIVATE bf::bmesh
  PRIVATE bf::depsgraph
--- a/source/blender/editors/gpencil_legacy/CMakeLists.txt
+++ b/source/blender/editors/gpencil_legacy/CMakeLists.txt
@@ -4,7 +4,6 @@

 set(INC
  ../include
-  ../../blenkernel
  ../../blentranslation
  ../../gpu
  ../../imbuf
@@ -33,7 +32,7 @@ set(SRC
 set(LIB
  PRIVATE bf::animrig
  PRIVATE bf::blenfont
-  bf_blenkernel
+  PRIVATE bf::blenkernel
  PRIVATE bf::blenlib
  PRIVATE bf::bmesh
  PRIVATE bf::depsgraph
--- a/source/blender/editors/grease_pencil/CMakeLists.txt
+++ b/source/blender/editors/grease_pencil/CMakeLists.txt
@@ -4,7 +4,6 @@

 set(INC
  ../include
-  ../../blenkernel
  ../../blentranslation
  ../../gpu
  ../../imbuf
@@ -46,7 +45,7 @@ set(SRC
 )

 set(LIB
-  bf_blenkernel
+  PRIVATE bf::blenkernel
  PRIVATE bf::animrig
  PRIVATE bf::blenlib
  PRIVATE bf::bmesh
--- a/source/blender/editors/id_management/CMakeLists.txt
+++ b/source/blender/editors/id_management/CMakeLists.txt
@@ -4,7 +4,6 @@

 set(INC
  ../include
-  ../../blenkernel
  ../../makesrna
  ../../windowmanager
 )
@@ -17,7 +16,7 @@ set(SRC
 )

 set(LIB
-  bf_blenkernel
+  PRIVATE bf::blenkernel
  bf_windowmanager
  PRIVATE bf::blenlib
  PRIVATE bf::dna
--- a/source/blender/editors/interface/CMakeLists.txt
+++ b/source/blender/editors/interface/CMakeLists.txt
@@ -7,7 +7,6 @@ set(INC
  ../asset
  ../include
  ../../asset_system
-  ../../blenkernel
  ../../blenloader
  ../../blentranslation
  ../../draw
@@ -101,7 +100,7 @@ set(SRC

 set(LIB
  PRIVATE bf::blenfont
-  bf_blenkernel
+  PRIVATE bf::blenkernel
  PRIVATE bf::blenlib
  PRIVATE bf::bmesh
  PRIVATE bf::depsgraph
--- a/source/blender/editors/io/CMakeLists.txt
+++ b/source/blender/editors/io/CMakeLists.txt
@@ -4,7 +4,6 @@

 set(INC
  ../include
-  ../../blenkernel
  ../../blentranslation
  ../../io/alembic
  ../../io/collada
@@ -50,7 +49,7 @@ set(SRC
 )

 set(LIB
-  bf_blenkernel
+  PRIVATE bf::blenkernel
  PRIVATE bf::blenlib
  PRIVATE bf::bmesh
  PRIVATE bf::depsgraph
--- a/source/blender/editors/lattice/CMakeLists.txt
+++ b/source/blender/editors/lattice/CMakeLists.txt
@@ -4,7 +4,6 @@

 set(INC
  ../include
-  ../../blenkernel
  ../../makesrna
  ../../render
  ../../windowmanager
@@ -24,6 +23,7 @@ set(SRC
 )

 set(LIB
+  PRIVATE bf::blenkernel
  PRIVATE bf::blenlib
  PRIVATE bf::depsgraph
  PRIVATE bf::dna
--- a/source/blender/editors/mask/CMakeLists.txt
+++ b/source/blender/editors/mask/CMakeLists.txt
@@ -4,7 +4,6 @@

 set(INC
  ../include
-  ../../blenkernel
  ../../blentranslation
  ../../gpu
  ../../makesrna
@@ -29,6 +28,7 @@ set(SRC
 )

 set(LIB
+  PRIVATE bf::blenkernel
  PRIVATE bf::blenlib
  PRIVATE bf::depsgraph
  PRIVATE bf::dna
--- a/source/blender/editors/mesh/CMakeLists.txt
+++ b/source/blender/editors/mesh/CMakeLists.txt
@@ -5,7 +5,6 @@
 set(INC
  ../include
  ../uvedit
-  ../../blenkernel
  ../../blentranslation
  ../../draw
  ../../functions
@@ -62,7 +61,7 @@ set(SRC

 set(LIB
  PRIVATE bf::blenfont
-  bf_blenkernel
+  PRIVATE bf::blenkernel
  PRIVATE bf::blenlib
  PRIVATE bf::bmesh
  PRIVATE bf::depsgraph
--- a/source/blender/editors/metaball/CMakeLists.txt
+++ b/source/blender/editors/metaball/CMakeLists.txt
@@ -4,7 +4,6 @@

 set(INC
  ../include
-  ../../blenkernel
  ../../blentranslation
  ../../gpu
  ../../makesrna
@@ -25,6 +24,7 @@ set(SRC
 )

 set(LIB
+  PRIVATE bf::blenkernel
  PRIVATE bf::blenlib
  PRIVATE bf::depsgraph
  PRIVATE bf::dna
--- a/source/blender/editors/object/CMakeLists.txt
+++ b/source/blender/editors/object/CMakeLists.txt
@@ -5,7 +5,6 @@
 set(INC
  ../include
  ../../asset_system
-  ../../blenkernel
  ../../blentranslation
  ../../functions
  ../../geometry
@@ -61,7 +60,7 @@ set(SRC
 set(LIB
  PRIVATE bf::animrig
  PRIVATE bf::blenfont
-  bf_blenkernel
+  PRIVATE bf::blenkernel
  PRIVATE bf::blenlib
  PRIVATE bf::bmesh
  PRIVATE bf::depsgraph
--- a/source/blender/editors/physics/CMakeLists.txt
+++ b/source/blender/editors/physics/CMakeLists.txt
@@ -4,7 +4,6 @@

 set(INC
  ../include
-  ../../blenkernel
  ../../blentranslation
  ../../gpu
  ../../makesrna
@@ -35,7 +34,7 @@ set(SRC
 )

 set(LIB
-  bf_blenkernel
+  PRIVATE bf::blenkernel
  PRIVATE bf::blenlib
  PRIVATE bf::depsgraph
  PRIVATE bf::dna
--- a/source/blender/editors/render/CMakeLists.txt
+++ b/source/blender/editors/render/CMakeLists.txt
@@ -4,7 +4,6 @@

 set(INC
  ../include
-  ../../blenkernel
  ../../blenloader
  ../../blentranslation
  ../../draw
@@ -36,6 +35,7 @@ set(SRC
 )

 set(LIB
+  PRIVATE bf::blenkernel
  PRIVATE bf::blenlib
  PRIVATE bf::bmesh
  PRIVATE bf::depsgraph
--- a/source/blender/editors/scene/CMakeLists.txt
+++ b/source/blender/editors/scene/CMakeLists.txt
@@ -4,7 +4,6 @@

 set(INC
  ../include
-  ../../blenkernel
  ../../blentranslation
  ../../makesrna
  ../../sequencer
@@ -21,7 +20,7 @@ set(SRC
 )

 set(LIB
-  bf_blenkernel
+  PRIVATE bf::blenkernel
  PRIVATE bf::blenlib
  PRIVATE bf::depsgraph
  PRIVATE bf::dna
--- a/source/blender/editors/screen/CMakeLists.txt
+++ b/source/blender/editors/screen/CMakeLists.txt
@@ -6,7 +6,6 @@ set(INC
  ../asset
  ../include
  ../../asset_system
-  ../../blenkernel
  ../../blenloader
  ../../blentranslation
  ../../gpu
@@ -44,6 +43,7 @@ set(SRC
 set(LIB
  PRIVATE bf::animrig
  PRIVATE bf::blenfont
+  PRIVATE bf::blenkernel
  PRIVATE bf::blenlib
  PRIVATE bf::bmesh
  PRIVATE bf::depsgraph
--- a/source/blender/editors/sculpt_paint/CMakeLists.txt
+++ b/source/blender/editors/sculpt_paint/CMakeLists.txt
@@ -9,7 +9,6 @@ set(INC
  ../include
  ../uvedit
  ../../asset_system
-  ../../blenkernel
  ../../blenlib
  ../../blenloader
  ../../blentranslation
@@ -179,7 +178,7 @@ set(SRC
 )

 set(LIB
-  bf_blenkernel
+  PRIVATE bf::blenkernel
  PRIVATE bf::animrig
  PRIVATE bf::blenlib
  PRIVATE bf::bmesh
--- a/source/blender/editors/sound/CMakeLists.txt
+++ b/source/blender/editors/sound/CMakeLists.txt
@@ -4,7 +4,6 @@

 set(INC
  ../include
-  ../../blenkernel
  ../../makesrna
  ../../sequencer
  ../../windowmanager
@@ -23,7 +22,7 @@ set(SRC
 )

 set(LIB
-  bf_blenkernel
+  PRIVATE bf::blenkernel
  PRIVATE bf::blenlib
  PRIVATE bf::depsgraph
  PRIVATE bf::dna
--- a/source/blender/editors/space_action/CMakeLists.txt
+++ b/source/blender/editors/space_action/CMakeLists.txt
@@ -4,7 +4,6 @@

 set(INC
  ../include
-  ../../blenkernel
  ../../blenloader
  ../../blentranslation
  ../../gpu
@@ -32,7 +31,7 @@ set(SRC
 )

 set(LIB
-  bf_blenkernel
+  PRIVATE bf::blenkernel
  PRIVATE bf::animrig
  PRIVATE bf::blenlib
  PRIVATE bf::depsgraph
--- a/source/blender/editors/space_api/CMakeLists.txt
+++ b/source/blender/editors/space_api/CMakeLists.txt
@@ -6,7 +6,6 @@ set(INC
  ../include
  ../io
  ../../asset_system
-  ../../blenkernel
  ../../gpu
  ../../makesrna
  ../../windowmanager
@@ -21,6 +20,7 @@ set(SRC
 )

 set(LIB
+  PRIVATE bf::blenkernel
  PRIVATE bf::blenlib
  PRIVATE bf::dna
  bf_editor_geometry
--- a/source/blender/editors/space_buttons/CMakeLists.txt
+++ b/source/blender/editors/space_buttons/CMakeLists.txt
@@ -4,7 +4,6 @@

 set(INC
  ../include
-  ../../blenkernel
  ../../blenloader
  ../../blentranslation
  ../../gpu
@@ -28,6 +27,7 @@ set(SRC
 )

 set(LIB
+  PRIVATE bf::blenkernel
  PRIVATE bf::blenlib
  PRIVATE bf::bmesh
  PRIVATE bf::dna
--- a/source/blender/editors/space_clip/CMakeLists.txt
+++ b/source/blender/editors/space_clip/CMakeLists.txt
@@ -4,7 +4,6 @@

 set(INC
  ../include
-  ../../blenkernel
  ../../blenloader
  ../../blentranslation
  ../../gpu
@@ -47,7 +46,7 @@ set(SRC

 set(LIB
  PRIVATE bf::blenfont
-  bf_blenkernel
+  PRIVATE bf::blenkernel
  PRIVATE bf::blenlib
  PRIVATE bf::depsgraph
  PRIVATE bf::dna
--- a/source/blender/editors/space_console/CMakeLists.txt
+++ b/source/blender/editors/space_console/CMakeLists.txt
@@ -4,7 +4,6 @@

 set(INC
  ../include
-  ../../blenkernel
  ../../blenloader
  ../../gpu
  ../../makesrna
@@ -25,7 +24,7 @@ set(SRC

 set(LIB
  PRIVATE bf::blenfont
-  bf_blenkernel
+  PRIVATE bf::blenkernel
  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
@@ -6,7 +6,6 @@ set(INC
  ../asset
  ../include
  ../../asset_system
-  ../../blenkernel
  ../../blenloader
  ../../blentranslation
  ../../gpu
@@ -46,7 +45,7 @@ set(SRC

 set(LIB
  PRIVATE bf::blenfont
-  bf_blenkernel
+  PRIVATE bf::blenkernel
  PRIVATE bf::blenlib
  PRIVATE bf::dna
  PRIVATE bf::intern::guardedalloc
--- a/source/blender/editors/space_graph/CMakeLists.txt
+++ b/source/blender/editors/space_graph/CMakeLists.txt
@@ -4,7 +4,6 @@

 set(INC
  ../include
-  ../../blenkernel
  ../../blenloader
  ../../blentranslation
  ../../gpu
@@ -33,7 +32,7 @@ set(SRC
 )

 set(LIB
-  bf_blenkernel
+  PRIVATE bf::blenkernel
  PRIVATE bf::blenlib
  PRIVATE bf::depsgraph
  PRIVATE bf::dna
--- a/source/blender/editors/space_image/CMakeLists.txt
+++ b/source/blender/editors/space_image/CMakeLists.txt
@@ -5,7 +5,6 @@
 set(INC
  ../asset
  ../include
-  ../../blenkernel
  ../../blenloader
  ../../blentranslation
  ../../draw
@@ -37,7 +36,7 @@ set(SRC

 set(LIB
  PRIVATE bf::blenfont
-  bf_blenkernel
+  PRIVATE bf::blenkernel
  PRIVATE bf::blenlib
  PRIVATE bf::bmesh
  PRIVATE bf::depsgraph
--- a/source/blender/editors/space_info/CMakeLists.txt
+++ b/source/blender/editors/space_info/CMakeLists.txt
@@ -4,7 +4,6 @@

 set(INC
  ../include
-  ../../blenkernel
  ../../blenloader
  ../../blentranslation
  ../../gpu
@@ -33,6 +32,7 @@ set(SRC

 set(LIB
  PRIVATE bf::blenfont
+  PRIVATE bf::blenkernel
  PRIVATE bf::blenlib
  PRIVATE bf::bmesh
  PRIVATE bf::depsgraph
--- a/source/blender/editors/space_nla/CMakeLists.txt
+++ b/source/blender/editors/space_nla/CMakeLists.txt
@@ -4,7 +4,6 @@

 set(INC
  ../include
-  ../../blenkernel
  ../../blenloader
  ../../blentranslation
  ../../gpu
@@ -31,7 +30,7 @@ set(SRC
 )

 set(LIB
-  bf_blenkernel
+  PRIVATE bf::blenkernel
  PRIVATE bf::animrig
  PRIVATE bf::blenlib
  PRIVATE bf::depsgraph
--- a/source/blender/editors/space_node/CMakeLists.txt
+++ b/source/blender/editors/space_node/CMakeLists.txt
@@ -6,7 +6,6 @@ set(INC
  ../include
  ../io
  ../../asset_system
-  ../../blenkernel
  ../../blenloader
  ../../blentranslation
  ../../compositor
@@ -53,7 +52,7 @@ set(SRC
 set(LIB
  PRIVATE bf::animrig
  PRIVATE bf::blenfont
-  bf_blenkernel
+  PRIVATE bf::blenkernel
  PRIVATE bf::blenlib
  PRIVATE bf::depsgraph
  PRIVATE bf::dna
--- a/source/blender/editors/space_outliner/CMakeLists.txt
+++ b/source/blender/editors/space_outliner/CMakeLists.txt
@@ -5,7 +5,6 @@
 set(INC
  ../include
  ../../blenfont
-  ../../blenkernel
  ../../blenloader
  ../../blentranslation
  ../../gpu
@@ -135,7 +134,7 @@ set(SRC

 set(LIB
  PRIVATE bf::animrig
-  bf_blenkernel
+  PRIVATE bf::blenkernel
  PRIVATE bf::blenlib
  PRIVATE bf::depsgraph
  PRIVATE bf::dna
--- a/source/blender/editors/space_script/CMakeLists.txt
+++ b/source/blender/editors/space_script/CMakeLists.txt
@@ -4,7 +4,6 @@

 set(INC
  ../include
-  ../../blenkernel
  ../../blenloader
  ../../blentranslation
  ../../gpu
@@ -25,6 +24,7 @@ set(SRC
 )

 set(LIB
+  PRIVATE bf::blenkernel
  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
@@ -4,7 +4,6 @@

 set(INC
  ../include
-  ../../blenkernel
  ../../blenloader
  ../../blentranslation
  ../../draw
@@ -55,6 +54,7 @@ set(SRC

 set(LIB
  PRIVATE bf::blenfont
+  PRIVATE bf::blenkernel
  PRIVATE bf::blenlib
  PRIVATE bf::depsgraph
  PRIVATE bf::dna
--- a/source/blender/editors/space_spreadsheet/CMakeLists.txt
+++ b/source/blender/editors/space_spreadsheet/CMakeLists.txt
@@ -4,7 +4,6 @@

 set(INC
  ../include
-  ../../blenkernel
  ../../blenloader
  ../../blentranslation
  ../../functions
@@ -49,6 +48,7 @@ set(SRC

 set(LIB
  PRIVATE bf::blenfont
+  PRIVATE bf::blenkernel
  PRIVATE bf::blenlib
  PRIVATE bf::bmesh
  PRIVATE bf::depsgraph
--- a/source/blender/editors/space_statusbar/CMakeLists.txt
+++ b/source/blender/editors/space_statusbar/CMakeLists.txt
@@ -4,7 +4,6 @@

 set(INC
  ../include
-  ../../blenkernel
  ../../blenloader
  ../../blentranslation
  ../../gpu
@@ -23,7 +22,7 @@ set(SRC
 )

 set(LIB
-  bf_blenkernel
+  PRIVATE bf::blenkernel
  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
@@ -4,7 +4,6 @@

 set(INC
  ../include
-  ../../blenkernel
  ../../blenloader
  ../../blentranslation
  ../../gpu
@@ -36,7 +35,7 @@ set(SRC

 set(LIB
  PRIVATE bf::blenfont
-  bf_blenkernel
+  PRIVATE bf::blenkernel
  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
@@ -4,7 +4,6 @@

 set(INC
  ../include
-  ../../blenkernel
  ../../blenloader
  ../../blentranslation
  ../../gpu
@@ -23,6 +22,7 @@ set(SRC
 )

 set(LIB
+  PRIVATE bf::blenkernel
  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
  ../../asset_system
-  ../../blenkernel
  ../../blenloader
  ../../blentranslation
  ../../makesrna
@@ -27,6 +26,7 @@ set(SRC
 )

 set(LIB
+  PRIVATE bf::blenkernel
  PRIVATE bf::blenlib
  PRIVATE bf::dna
  PRIVATE bf::extern::fmtlib
--- a/source/blender/editors/space_view3d/CMakeLists.txt
+++ b/source/blender/editors/space_view3d/CMakeLists.txt
@@ -6,7 +6,6 @@ set(INC
  ../asset
  ../include
  ../../asset_system
-  ../../blenkernel
  ../../blenloader
  ../../blentranslation
  ../../draw
@@ -83,6 +82,7 @@ set(SRC
 set(LIB
  PRIVATE bf::animrig
  PRIVATE bf::blenfont
+  PRIVATE bf::blenkernel
  PRIVATE bf::blenlib
  PRIVATE bf::bmesh
  PRIVATE bf::depsgraph
--- a/source/blender/editors/transform/CMakeLists.txt
+++ b/source/blender/editors/transform/CMakeLists.txt
@@ -4,7 +4,6 @@

 set(INC
  ../include
-  ../../blenkernel
  ../../blentranslation
  ../../gpu
  ../../ikplugin
@@ -114,7 +113,7 @@ set(LIB
  PRIVATE bf::animrig
  PRIVATE bf::blenfont
  PRIVATE bf::extern::fmtlib
-  bf_blenkernel
+  PRIVATE bf::blenkernel
  PRIVATE bf::blenlib
  PRIVATE bf::bmesh
  PRIVATE bf::depsgraph
--- a/source/blender/editors/undo/CMakeLists.txt
+++ b/source/blender/editors/undo/CMakeLists.txt
@@ -5,7 +5,6 @@
 set(INC
  ../include
  ../../asset_system
-  ../../blenkernel
  ../../blenloader
  ../../blentranslation
  ../../makesrna
@@ -24,7 +23,7 @@ set(SRC
 )

 set(LIB
-  bf_blenkernel
+  PRIVATE bf::blenkernel
  PRIVATE bf::blenlib
  PRIVATE bf::bmesh
  PRIVATE bf::dna
--- a/source/blender/editors/util/CMakeLists.txt
+++ b/source/blender/editors/util/CMakeLists.txt
@@ -6,7 +6,6 @@ set(INC
  ../include
  ../space_sequencer
  ../../asset_system
-  ../../blenkernel
  ../../blentranslation
  ../../gpu
  ../../imbuf
@@ -110,6 +109,7 @@ set(SRC
 set(LIB
  PRIVATE bf::animrig
  PRIVATE bf::blenfont
+  PRIVATE bf::blenkernel
  PRIVATE bf::blenlib
  PRIVATE bf::bmesh
  PRIVATE bf::depsgraph
--- a/source/blender/editors/uvedit/CMakeLists.txt
+++ b/source/blender/editors/uvedit/CMakeLists.txt
@@ -4,7 +4,6 @@

 set(INC
  ../include
-  ../../blenkernel
  ../../blentranslation
  ../../geometry
  ../../gpu
@@ -36,6 +35,7 @@ set(SRC
 )

 set(LIB
+  PRIVATE bf::blenkernel
  PRIVATE bf::blenlib
  PRIVATE bf::bmesh
  PRIVATE bf::depsgraph
--- a/source/blender/freestyle/CMakeLists.txt
+++ b/source/blender/freestyle/CMakeLists.txt
@@ -530,6 +530,7 @@ set(SRC
 )

 set(LIB
+  PRIVATE bf::blenkernel
  PRIVATE bf::blenlib
  PRIVATE bf::depsgraph
  PRIVATE bf::dna
@@ -542,7 +543,6 @@ set(LIB

 set(INC
  .
-  ../blenkernel
  ../blentranslation
  ../imbuf
  ../makesrna
--- a/source/blender/geometry/CMakeLists.txt
+++ b/source/blender/geometry/CMakeLists.txt
@@ -4,7 +4,6 @@

 set(INC
  .
-  ../blenkernel
  ../blentranslation
  ../functions
  ../makesrna
@@ -99,7 +98,7 @@ set(SRC
 )

 set(LIB
-  bf_blenkernel
+  PRIVATE bf::blenkernel
  PRIVATE bf::blenlib
  PRIVATE bf::bmesh
  PRIVATE bf::dna
--- a/source/blender/gpu/CMakeLists.txt
+++ b/source/blender/gpu/CMakeLists.txt
@@ -9,7 +9,6 @@ set(INC
  metal
  opengl
  vulkan
-  ../blenkernel
  ../draw
  ../imbuf
  ../makesrna
@@ -380,6 +379,7 @@ set(METAL_SRC
 )

 set(LIB
+  PRIVATE bf::blenkernel
  PRIVATE bf::blenlib
  PRIVATE bf::bmesh
  PRIVATE bf::dna
--- a/source/blender/ikplugin/CMakeLists.txt
+++ b/source/blender/ikplugin/CMakeLists.txt
@@ -6,7 +6,6 @@ remove_extra_strict_flags()

 set(INC
  .
-  ../blenkernel
 )

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

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

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

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

 set(LIB
+  PRIVATE bf::blenkernel
  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
@@ -6,7 +6,6 @@ set(INC
  .
  ..
  ../..
-  ../../../blenkernel
  ../../../../../intern/utfconv
 )

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

 set(LIB
  ${OPENIMAGEIO_LIBRARIES}
+  PRIVATE bf::blenkernel
  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
@@ -6,7 +6,6 @@ set(INC
  .
  ..
  ../..
-  ../../../blenkernel
  ../../../../../intern/utfconv
 )

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

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

 set(INC_SYS
@@ -29,6 +28,7 @@ set(SRC

 set(LIB
  PRIVATE bf_blenkernel
+  PRIVATE bf::blenkernel
  PRIVATE bf::blenlib
  PRIVATE bf_imbuf
  PRIVATE bf::intern::guardedalloc
--- a/source/blender/io/alembic/CMakeLists.txt
+++ b/source/blender/io/alembic/CMakeLists.txt
@@ -5,7 +5,6 @@
 set(INC
  .
  ../common
-  ../../blenkernel
  ../../blenloader
  ../../blentranslation
  ../../editors/include
@@ -83,7 +82,7 @@ set(SRC
 )

 set(LIB
-  bf_blenkernel
+  PRIVATE bf::blenkernel
  PRIVATE bf::blenlib
  PRIVATE bf::bmesh
  PRIVATE bf::depsgraph
--- a/source/blender/io/collada/CMakeLists.txt
+++ b/source/blender/io/collada/CMakeLists.txt
@@ -21,7 +21,6 @@ unset(OPENCOLLADA_ANIMATION_CLIP CACHE)

 set(INC
  .
-  ../../blenkernel
  ../../blentranslation
  ../../editors/include
  ../../ikplugin
@@ -113,6 +112,7 @@ set(LIB
  ${PCRE_LIBRARIES}
  ${XML2_LIBRARIES}
  PRIVATE bf::animrig
+  PRIVATE bf::blenkernel
  PRIVATE bf::blenlib
  PRIVATE bf::bmesh
  PRIVATE bf::depsgraph
--- a/source/blender/io/common/CMakeLists.txt
+++ b/source/blender/io/common/CMakeLists.txt
@@ -4,7 +4,6 @@

 set(INC
  .
-  ../../blenkernel
  ../../makesrna
 )

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

 set(LIB
-  bf_blenkernel
+  PRIVATE bf::blenkernel
  PRIVATE bf::blenlib
  PRIVATE bf::depsgraph
  PRIVATE bf::dna
--- a/source/blender/io/grease_pencil/CMakeLists.txt
+++ b/source/blender/io/grease_pencil/CMakeLists.txt
@@ -5,7 +5,6 @@
 set(INC
  .
  ../common
-  ../../blenkernel
  ../../blenloader
  ../../editors/include
  ../../functions
@@ -30,7 +29,7 @@ set(SRC
 )

 set(LIB
-  bf_blenkernel
+  PRIVATE bf::blenkernel
  PRIVATE bf::blenlib
  PRIVATE bf::bmesh
  PRIVATE bf::depsgraph
--- a/source/blender/io/ply/CMakeLists.txt
+++ b/source/blender/io/ply/CMakeLists.txt
@@ -8,7 +8,6 @@ set(INC
  importer
  intern
  ../common
-  ../../blenkernel
  ../../geometry
  ../../makesrna
  ../../windowmanager
@@ -49,7 +48,7 @@ set(SRC
 )

 set(LIB
-  bf_blenkernel
+  PRIVATE bf::blenkernel
  PRIVATE bf::blenlib
  PRIVATE bf::bmesh
  PRIVATE bf::depsgraph
--- a/source/blender/io/stl/CMakeLists.txt
+++ b/source/blender/io/stl/CMakeLists.txt
@@ -8,7 +8,6 @@ set(INC
  importer
  intern
  ../common
-  ../../blenkernel
  ../../editors/include
  ../../makesrna
  ../../windowmanager
@@ -39,7 +38,7 @@ set(SRC
 )

 set(LIB
-  bf_blenkernel
+  PRIVATE bf::blenkernel
  PRIVATE bf::blenlib
  PRIVATE bf::bmesh
  PRIVATE bf::depsgraph
--- a/source/blender/io/usd/CMakeLists.txt
+++ b/source/blender/io/usd/CMakeLists.txt
@@ -44,7 +44,6 @@ endif()
 set(INC
  .
  ../common
-  ../../blenkernel
  ../../blenloader
  ../../blentranslation
  ../../editors/include
@@ -194,7 +193,7 @@ if(WITH_HYDRA)
 endif()

 set(LIB
-  bf_blenkernel
+  PRIVATE bf::blenkernel
  PRIVATE bf::blenlib
  PRIVATE bf::bmesh
  PRIVATE bf::depsgraph
--- a/source/blender/io/wavefront_obj/CMakeLists.txt
+++ b/source/blender/io/wavefront_obj/CMakeLists.txt
@@ -7,7 +7,6 @@ set(INC
  exporter
  importer
  ../common
-  ../../blenkernel
  ../../bmesh/intern
  ../../editors/include
  ../../makesrna
@@ -52,7 +51,7 @@ set(SRC
 )

 set(LIB
-  bf_blenkernel
+  PRIVATE bf::blenkernel
  PRIVATE bf::blenlib
  PRIVATE bf::bmesh
  PRIVATE bf::depsgraph
--- a/source/blender/modifiers/CMakeLists.txt
+++ b/source/blender/modifiers/CMakeLists.txt
@@ -6,7 +6,6 @@ set(INC
  .
  intern
  intern/lineart
-  ../blenkernel
  ../blenloader
  ../blentranslation
  ../editors/include
@@ -140,7 +139,7 @@ set(SRC

 set(LIB
  PRIVATE bf::blenfont
-  bf_blenkernel
+  PRIVATE bf::blenkernel
  PRIVATE bf::blenlib
  PRIVATE bf::bmesh
  PRIVATE bf::depsgraph
--- a/source/blender/nodes/CMakeLists.txt
+++ b/source/blender/nodes/CMakeLists.txt
@@ -55,7 +55,6 @@ set(INC
  texture
  ../animrig
  ../editors/include
-  ../blenkernel
  ../blenloader
  ../blentranslation
  ../depsgraph
@@ -140,6 +139,7 @@ set(SRC
 )

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

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

 set(LIB
+  PRIVATE bf::blenkernel
  PRIVATE bf::blenlib
  PRIVATE bf::dna
  bf_functions
--- a/source/blender/nodes/geometry/CMakeLists.txt
+++ b/source/blender/nodes/geometry/CMakeLists.txt
@@ -8,7 +8,6 @@ set(INC
  include
  ../intern
  ../../editors/include
-  ../../blenkernel
  ../../blenloader
  ../../blentranslation
  ../../functions
@@ -247,6 +246,7 @@ set(SRC
 )

 set(LIB
+  PRIVATE bf::blenkernel
  PRIVATE bf::blenlib
  PRIVATE bf::bmesh
  PRIVATE bf::depsgraph
--- a/source/blender/nodes/shader/CMakeLists.txt
+++ b/source/blender/nodes/shader/CMakeLists.txt
@@ -6,7 +6,6 @@ set(INC
  .
  ..
  ../intern
-  ../../blenkernel
  ../../blentranslation
  ../../editors/include
  ../../functions
@@ -129,6 +128,7 @@ set(SRC
 )

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

 set(LIB
+  PRIVATE bf::blenkernel
  PRIVATE bf::blenlib
  PRIVATE bf::bmesh
  PRIVATE bf::depsgraph
--- a/source/blender/python/bmesh/CMakeLists.txt
+++ b/source/blender/python/bmesh/CMakeLists.txt
@@ -4,7 +4,6 @@

 set(INC
  .
-  ../../blenkernel
 )

 set(INC_SYS
@@ -34,7 +33,7 @@ set(SRC
 )

 set(LIB
-  bf_blenkernel
+  PRIVATE bf::blenkernel
  PRIVATE bf::blenlib
  PRIVATE bf::bmesh
  PRIVATE bf::depsgraph
--- a/source/blender/python/generic/CMakeLists.txt
+++ b/source/blender/python/generic/CMakeLists.txt
@@ -4,7 +4,6 @@

 set(INC
  .
-  ../../blenkernel
  ../../gpu
  ../../makesrna
 )
@@ -41,6 +40,7 @@ set(SRC
 set(LIB
  ${PYTHON_LINKFLAGS}
  ${PYTHON_LIBRARIES}
+  PRIVATE bf::blenkernel
  PRIVATE bf::blenlib
  PRIVATE bf::dna
  PRIVATE bf::intern::clog
--- a/source/blender/python/gpu/CMakeLists.txt
+++ b/source/blender/python/gpu/CMakeLists.txt
@@ -4,7 +4,6 @@

 set(INC
  .
-  ../../blenkernel
  ../../editors/include
  ../../gpu
  ../../imbuf
@@ -60,6 +59,7 @@ set(SRC
 set(LIB
  ${PYTHON_LINKFLAGS}
  ${PYTHON_LIBRARIES}
+  PRIVATE bf::blenkernel
  PRIVATE bf::blenlib
  PRIVATE bf::dna
  PRIVATE bf::intern::guardedalloc
--- a/source/blender/python/intern/CMakeLists.txt
+++ b/source/blender/python/intern/CMakeLists.txt
@@ -4,7 +4,6 @@

 set(INC
  ..
-  ../../blenkernel
  ../../blenloader
  ../../blentranslation
  ../../editors/include
@@ -120,6 +119,7 @@ set(SRC
 )

 set(LIB
+  PRIVATE bf::blenkernel
  PRIVATE bf::blenlib
  PRIVATE bf::depsgraph
  PRIVATE bf::dna
--- a/source/blender/python/mathutils/CMakeLists.txt
+++ b/source/blender/python/mathutils/CMakeLists.txt
@@ -4,7 +4,6 @@

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

@@ -39,6 +38,7 @@ set(SRC
 )

 set(LIB
+  PRIVATE bf::blenkernel
  PRIVATE bf::blenlib
  PRIVATE bf::bmesh
  PRIVATE bf::depsgraph
--- a/source/blender/render/CMakeLists.txt
+++ b/source/blender/render/CMakeLists.txt
@@ -6,7 +6,6 @@
 set(INC
  .
  intern
-  ../blenkernel
  ../blentranslation
  ../compositor
  ../compositor/cached_resources
@@ -61,6 +60,7 @@ set(SRC
 )

 set(LIB
+  PRIVATE bf::blenkernel
  PRIVATE bf::blenlib
  PRIVATE bf::depsgraph
  PRIVATE bf::dna
--- a/source/blender/render/hydra/CMakeLists.txt
+++ b/source/blender/render/hydra/CMakeLists.txt
@@ -43,7 +43,6 @@ endif()

 set(INC
  ../../../../intern/guardedalloc
-  ../../blenkernel
  ../../blenlib
  ../../imbuf
  ../../makesdna
@@ -74,6 +73,7 @@ set(LIB
  ${BOOST_LIBRARIES}
  ${USD_LIBRARIES}
  ${TBB_LIBRARIES}
+  PRIVATE bf::blenkernel
  PRIVATE bf::depsgraph
  PRIVATE bf::intern::clog
  bf_io_usd
--- a/source/blender/sequencer/CMakeLists.txt
+++ b/source/blender/sequencer/CMakeLists.txt
@@ -6,7 +6,6 @@ set(INC
  .
  intern
  ../animrig
-  ../blenkernel
  ../blenloader
  ../blentranslation
  ../imbuf
@@ -85,7 +84,7 @@ set(SRC

 set(LIB
  PRIVATE bf::blenfont
-  bf_blenkernel
+  PRIVATE bf::blenkernel
  PRIVATE bf::blenlib
  PRIVATE bf::depsgraph
  PRIVATE bf::dna
--- a/source/blender/shader_fx/CMakeLists.txt
+++ b/source/blender/shader_fx/CMakeLists.txt
@@ -5,7 +5,6 @@
 set(INC
  .
  intern
-  ../blenkernel
  ../blentranslation
  ../editors/include
  ../makesrna
@@ -41,6 +40,7 @@ set(SRC

 set(LIB
  PRIVATE bf::blenfont
+  PRIVATE bf::blenkernel
  PRIVATE bf::blenlib
  PRIVATE bf::bmesh
  PRIVATE bf::depsgraph
--- a/source/blender/simulation/CMakeLists.txt
+++ b/source/blender/simulation/CMakeLists.txt
@@ -5,7 +5,6 @@
 set(INC
  .
  intern
-  ../blenkernel
  ../functions
  ../imbuf
  ../makesrna
@@ -30,7 +29,7 @@ set(SRC
 )

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

 set(LIB
  PRIVATE bf::blenfont
+  PRIVATE bf::blenkernel
  PRIVATE bf::blenlib
  PRIVATE bf::bmesh
  PRIVATE bf::depsgraph
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -3,7 +3,6 @@
 # SPDX-License-Identifier: GPL-2.0-or-later

 set(INC
-  ../blender/blenkernel
  ../blender/editors/include
  ../blender/gpu
  ../blender/imbuf
@@ -15,6 +14,7 @@ set(INC
 )

 set(LIB
+  PRIVATE bf::blenkernel
  PRIVATE bf::blenlib
  PRIVATE bf::bmesh
  PRIVATE bf::depsgraph