Cleanup: CMake: Modernize bf_gpu dependencies

Pretty straightforward - Remove any bf_gpu 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/132286
2024-12-23 21:38:19 +01:00
parent e315816dc5
commit b7407aabb5
59 changed files with 60 additions and 63 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/gpu
  ../../../source/blender/render
  ${CMAKE_BINARY_DIR}/source/blender/makesrna/intern
 )
@@ -60,6 +59,7 @@ set(LIB
  PRIVATE bf::blenkernel
  PRIVATE bf::blenlib
  PRIVATE bf::dna
+  PRIVATE bf::gpu
  PRIVATE bf::intern::guardedalloc
  cycles_bvh
  cycles_device
--- a/intern/ghost/CMakeLists.txt
+++ b/intern/ghost/CMakeLists.txt
@@ -4,7 +4,6 @@

 set(INC
  PUBLIC .
-  ../../source/blender/gpu
  ../../source/blender/imbuf
  ../guardedalloc
 )
@@ -74,6 +73,7 @@ set(SRC
 set(LIB
  PRIVATE bf::blenlib
  PRIVATE bf::dna
+  PRIVATE bf::gpu
  PRIVATE bf::intern::clog
 )

--- a/intern/opencolorio/CMakeLists.txt
+++ b/intern/opencolorio/CMakeLists.txt
@@ -4,7 +4,6 @@

 set(INC
  .
-  ../../source/blender/gpu
  ../../source/blender/gpu/intern
 )

@@ -24,6 +23,7 @@ set(SRC
 set(LIB
  PRIVATE bf::blenlib
  PRIVATE bf::dna
+  PRIVATE bf::gpu
  PRIVATE bf::intern::guardedalloc
 )

--- a/source/blender/blenfont/CMakeLists.txt
+++ b/source/blender/blenfont/CMakeLists.txt
@@ -5,7 +5,6 @@
 set(INC
  PUBLIC .
  ../blentranslation
-  ../gpu
  ../imbuf
  ../makesrna
 )
@@ -31,7 +30,7 @@ set(LIB
  PRIVATE bf::blenkernel
  PRIVATE bf::blenlib
  PRIVATE bf::dna
-  bf_gpu
+  PRIVATE bf::gpu
  PRIVATE bf::intern::guardedalloc
  ${FREETYPE_LIBRARIES} ${BROTLI_LIBRARIES}
 )
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -9,7 +9,6 @@ set(INC
  ../blentranslation
  ../draw
  ../functions
-  ../gpu
  ../ikplugin
  ../imbuf
  ../makesrna
@@ -568,7 +567,7 @@ set(LIB
  bf_draw
  PRIVATE bf::extern::curve_fit_nd
  bf_functions
-  bf_gpu
+  PRIVATE bf::gpu
  bf_ikplugin
  bf_imbuf
  bf::imbuf_movie
--- a/source/blender/blenloader/CMakeLists.txt
+++ b/source/blender/blenloader/CMakeLists.txt
@@ -7,7 +7,6 @@ set(INC
  ../blentranslation
  ../draw
  ../editors/include
-  ../gpu
  ../imbuf
  ../imbuf/movie
  ../makesrna
@@ -63,6 +62,7 @@ set(LIB
  PRIVATE bf::bmesh
  PRIVATE bf::depsgraph
  PRIVATE bf::dna
+  PRIVATE bf::gpu
  PRIVATE bf::intern::clog
  PRIVATE bf::intern::guardedalloc
  PRIVATE bf::extern::fmtlib
--- a/source/blender/compositor/CMakeLists.txt
+++ b/source/blender/compositor/CMakeLists.txt
@@ -9,7 +9,6 @@ set(INC
  utilities
  ../blentranslation
  ../functions
-  ../gpu
  ../gpu/intern
  ../imbuf
  ../makesrna
@@ -149,7 +148,7 @@ set(SRC
 set(LIB
  PRIVATE bf::blenkernel
  bf_functions
-  bf_gpu
+  PRIVATE bf::gpu
  bf_imbuf
  bf_render
  PRIVATE bf::blenlib
--- a/source/blender/draw/CMakeLists.txt
+++ b/source/blender/draw/CMakeLists.txt
@@ -11,7 +11,6 @@ set(INC
  ../editors/include
  ../editors/space_view3d
  ../functions
-  ../gpu
  ../gpu/intern
  ../imbuf
  ../makesrna
@@ -308,6 +307,7 @@ set(LIB
  PRIVATE bf::bmesh
  PRIVATE bf::depsgraph
  PRIVATE bf::dna
+  PRIVATE bf::gpu
  PRIVATE bf::intern::clog
  PRIVATE bf::intern::guardedalloc
  bf_compositor
--- a/source/blender/editors/animation/CMakeLists.txt
+++ b/source/blender/editors/animation/CMakeLists.txt
@@ -5,7 +5,6 @@
 set(INC
  ../include
  ../../blentranslation
-  ../../gpu
  ../../makesrna
  ../../sequencer
  ../../windowmanager
@@ -46,6 +45,7 @@ set(LIB
  PRIVATE bf::blenlib
  PRIVATE bf::depsgraph
  PRIVATE bf::dna
+  PRIVATE bf::gpu
  PRIVATE bf::intern::clog
  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
  ../../blenloader
  ../../blentranslation
-  ../../gpu
  ../../makesrna
  ../../windowmanager
  ../../../../intern/eigen
@@ -49,6 +48,7 @@ set(LIB
  PRIVATE bf::depsgraph
  PRIVATE bf::dna
  PRIVATE bf::extern::fmtlib
+  PRIVATE bf::gpu
  PRIVATE bf::intern::clog
  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
  ../../blentranslation
-  ../../gpu
  ../../makesrna
  ../../windowmanager
  # RNA_prototypes.hh
@@ -37,6 +36,7 @@ set(LIB
  PRIVATE bf::depsgraph
  PRIVATE bf::dna
  PRIVATE bf::extern::curve_fit_nd
+  PRIVATE bf::gpu
  PRIVATE bf::intern::clog
  PRIVATE bf::intern::guardedalloc
 )
--- a/source/blender/editors/curves/CMakeLists.txt
+++ b/source/blender/editors/curves/CMakeLists.txt
@@ -7,7 +7,6 @@ set(INC
  ../../blentranslation
  ../../functions
  ../../geometry
-  ../../gpu
  ../../makesrna
  ../../windowmanager

@@ -40,6 +39,7 @@ set(LIB
  PRIVATE bf::dna
  PRIVATE bf::extern::curve_fit_nd
  PRIVATE bf::extern::fmtlib
+  PRIVATE bf::gpu
  PRIVATE bf::intern::clog
  PRIVATE bf::intern::guardedalloc
 )
--- a/source/blender/editors/gizmo_library/CMakeLists.txt
+++ b/source/blender/editors/gizmo_library/CMakeLists.txt
@@ -5,7 +5,6 @@
 set(INC
  ../include
  ../../blentranslation
-  ../../gpu
  ../../makesrna
  ../../windowmanager
  ../../../../intern/eigen
@@ -42,6 +41,7 @@ set(LIB
  PRIVATE bf::bmesh
  PRIVATE bf::depsgraph
  PRIVATE bf::dna
+  PRIVATE bf::gpu
  PRIVATE bf::intern::clog
  PRIVATE bf::intern::guardedalloc
 )
--- a/source/blender/editors/gpencil_legacy/CMakeLists.txt
+++ b/source/blender/editors/gpencil_legacy/CMakeLists.txt
@@ -5,7 +5,6 @@
 set(INC
  ../include
  ../../blentranslation
-  ../../gpu
  ../../imbuf
  ../../makesrna
  ../../windowmanager
@@ -37,6 +36,7 @@ set(LIB
  PRIVATE bf::bmesh
  PRIVATE bf::depsgraph
  PRIVATE bf::dna
+  PRIVATE bf::gpu
  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
  ../../blentranslation
-  ../../gpu
  ../../imbuf
  ../../makesrna
  ../../windowmanager
@@ -51,6 +50,7 @@ set(LIB
  PRIVATE bf::bmesh
  PRIVATE bf::depsgraph
  PRIVATE bf::dna
+  PRIVATE bf::gpu
  PRIVATE bf::intern::guardedalloc
  PRIVATE bf::intern::clog
  extern_curve_fit_nd
--- a/source/blender/editors/interface/CMakeLists.txt
+++ b/source/blender/editors/interface/CMakeLists.txt
@@ -11,7 +11,6 @@ set(INC
  ../../blentranslation
  ../../draw
  ../../functions
-  ../../gpu
  ../../imbuf
  ../../imbuf/movie
  ../../makesrna
@@ -108,6 +107,7 @@ set(LIB
  bf_editor_datafiles
  bf_editor_id_management
  PRIVATE bf::extern::fmtlib
+  PRIVATE bf::gpu
  PRIVATE bf::intern::guardedalloc
  PRIVATE bf::animrig
 )
--- a/source/blender/editors/mask/CMakeLists.txt
+++ b/source/blender/editors/mask/CMakeLists.txt
@@ -5,7 +5,6 @@
 set(INC
  ../include
  ../../blentranslation
-  ../../gpu
  ../../makesrna
  ../../windowmanager
 )
@@ -32,6 +31,7 @@ set(LIB
  PRIVATE bf::blenlib
  PRIVATE bf::depsgraph
  PRIVATE bf::dna
+  PRIVATE bf::gpu
  PRIVATE bf::intern::guardedalloc
  PRIVATE bf::animrig
 )
--- a/source/blender/editors/mesh/CMakeLists.txt
+++ b/source/blender/editors/mesh/CMakeLists.txt
@@ -9,7 +9,6 @@ set(INC
  ../../draw
  ../../functions
  ../../geometry
-  ../../gpu
  ../../imbuf
  ../../makesrna
  ../../render
@@ -67,6 +66,7 @@ set(LIB
  PRIVATE bf::depsgraph
  PRIVATE bf::dna
  PRIVATE bf::extern::fmtlib
+  PRIVATE bf::gpu
  PRIVATE bf::intern::clog
  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
  ../../blentranslation
-  ../../gpu
  ../../makesrna
  ../../render
  ../../windowmanager
@@ -28,6 +27,7 @@ set(LIB
  PRIVATE bf::blenlib
  PRIVATE bf::depsgraph
  PRIVATE bf::dna
+  PRIVATE bf::gpu
  PRIVATE bf::intern::clog
  PRIVATE bf::intern::guardedalloc
 )
--- a/source/blender/editors/object/CMakeLists.txt
+++ b/source/blender/editors/object/CMakeLists.txt
@@ -8,7 +8,6 @@ set(INC
  ../../blentranslation
  ../../functions
  ../../geometry
-  ../../gpu
  ../../ikplugin
  ../../imbuf
  ../../makesrna
@@ -69,6 +68,7 @@ set(LIB
  bf_editor_metaball
  bf_editor_grease_pencil
  PRIVATE bf::extern::fmtlib
+  PRIVATE bf::gpu
  PRIVATE bf::intern::clog
  PRIVATE bf::intern::guardedalloc
  bf_render
--- a/source/blender/editors/physics/CMakeLists.txt
+++ b/source/blender/editors/physics/CMakeLists.txt
@@ -5,7 +5,6 @@
 set(INC
  ../include
  ../../blentranslation
-  ../../gpu
  ../../makesrna
  ../../windowmanager
  ../../../../intern/mantaflow/extern
@@ -38,6 +37,7 @@ set(LIB
  PRIVATE bf::blenlib
  PRIVATE bf::depsgraph
  PRIVATE bf::dna
+  PRIVATE bf::gpu
  PRIVATE bf::intern::clog
  PRIVATE bf::intern::guardedalloc
 )
--- a/source/blender/editors/render/CMakeLists.txt
+++ b/source/blender/editors/render/CMakeLists.txt
@@ -7,7 +7,6 @@ set(INC
  ../../blenloader
  ../../blentranslation
  ../../draw
-  ../../gpu
  ../../imbuf
  ../../imbuf/movie
  ../../makesrna
@@ -41,6 +40,7 @@ set(LIB
  PRIVATE bf::depsgraph
  PRIVATE bf::dna
  bf_draw
+  PRIVATE bf::gpu
  PRIVATE bf::intern::guardedalloc
  PRIVATE bf::animrig
 )
--- a/source/blender/editors/screen/CMakeLists.txt
+++ b/source/blender/editors/screen/CMakeLists.txt
@@ -8,7 +8,6 @@ set(INC
  ../../asset_system
  ../../blenloader
  ../../blentranslation
-  ../../gpu
  ../../imbuf
  ../../makesrna
  ../../sequencer
@@ -50,6 +49,7 @@ set(LIB
  PRIVATE bf::dna
  bf_editor_datafiles
  bf_editor_space_sequencer
+  PRIVATE bf::gpu
  PRIVATE bf::intern::guardedalloc
  PRIVATE bf::extern::fmtlib
 )
--- a/source/blender/editors/sculpt_paint/CMakeLists.txt
+++ b/source/blender/editors/sculpt_paint/CMakeLists.txt
@@ -15,7 +15,6 @@ set(INC
  ../../draw
  ../../functions
  ../../geometry
-  ../../gpu
  ../../imbuf
  ../../makesrna
  ../../nodes
@@ -185,6 +184,7 @@ set(LIB
  PRIVATE bf::depsgraph
  PRIVATE bf::dna
  PRIVATE bf::extern::fmtlib
+  PRIVATE bf::gpu
  PRIVATE bf::intern::atomic
  PRIVATE bf::intern::clog
  PRIVATE bf::intern::guardedalloc
--- a/source/blender/editors/space_action/CMakeLists.txt
+++ b/source/blender/editors/space_action/CMakeLists.txt
@@ -6,7 +6,6 @@ set(INC
  ../include
  ../../blenloader
  ../../blentranslation
-  ../../gpu
  ../../makesrna
  ../../modifiers
  ../../windowmanager
@@ -36,6 +35,7 @@ set(LIB
  PRIVATE bf::blenlib
  PRIVATE bf::depsgraph
  PRIVATE bf::dna
+  PRIVATE bf::gpu
  PRIVATE bf::intern::guardedalloc
  PRIVATE bf::animrig
 )
--- 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
-  ../../gpu
  ../../makesrna
  ../../windowmanager
 )
@@ -43,6 +42,7 @@ set(LIB
  bf_editor_space_topbar
  bf_editor_space_userpref
  bf_editor_space_view3d
+  PRIVATE bf::gpu
  PRIVATE bf::intern::guardedalloc
 )

--- a/source/blender/editors/space_buttons/CMakeLists.txt
+++ b/source/blender/editors/space_buttons/CMakeLists.txt
@@ -6,7 +6,6 @@ set(INC
  ../include
  ../../blenloader
  ../../blentranslation
-  ../../gpu
  ../../makesrna
  ../../windowmanager

@@ -31,6 +30,7 @@ set(LIB
  PRIVATE bf::blenlib
  PRIVATE bf::bmesh
  PRIVATE bf::dna
+  PRIVATE bf::gpu
  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
  ../../blenloader
  ../../blentranslation
-  ../../gpu
  ../../imbuf
  ../../imbuf/movie
  ../../makesrna
@@ -50,6 +49,7 @@ set(LIB
  PRIVATE bf::blenlib
  PRIVATE bf::depsgraph
  PRIVATE bf::dna
+  PRIVATE bf::gpu
  PRIVATE bf::intern::guardedalloc
 )

--- a/source/blender/editors/space_console/CMakeLists.txt
+++ b/source/blender/editors/space_console/CMakeLists.txt
@@ -5,7 +5,6 @@
 set(INC
  ../include
  ../../blenloader
-  ../../gpu
  ../../makesrna
  ../../windowmanager

@@ -27,6 +26,7 @@ set(LIB
  PRIVATE bf::blenkernel
  PRIVATE bf::blenlib
  PRIVATE bf::dna
+  PRIVATE bf::gpu
  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
  ../../blenloader
  ../../blentranslation
-  ../../gpu
  ../../imbuf
  ../../imbuf/movie
  ../../makesrna
@@ -48,6 +47,7 @@ set(LIB
  PRIVATE bf::blenkernel
  PRIVATE bf::blenlib
  PRIVATE bf::dna
+  PRIVATE bf::gpu
  PRIVATE bf::intern::guardedalloc
  PRIVATE bf::extern::fmtlib
  PRIVATE bf::intern::atomic
--- a/source/blender/editors/space_graph/CMakeLists.txt
+++ b/source/blender/editors/space_graph/CMakeLists.txt
@@ -6,7 +6,6 @@ set(INC
  ../include
  ../../blenloader
  ../../blentranslation
-  ../../gpu
  ../../makesrna
  ../../windowmanager

@@ -36,6 +35,7 @@ set(LIB
  PRIVATE bf::blenlib
  PRIVATE bf::depsgraph
  PRIVATE bf::dna
+  PRIVATE bf::gpu
  PRIVATE bf::intern::guardedalloc
  PRIVATE bf::animrig
 )
--- a/source/blender/editors/space_image/CMakeLists.txt
+++ b/source/blender/editors/space_image/CMakeLists.txt
@@ -8,7 +8,6 @@ set(INC
  ../../blenloader
  ../../blentranslation
  ../../draw
-  ../../gpu
  ../../imbuf
  ../../imbuf/movie
  ../../makesrna
@@ -42,6 +41,7 @@ set(LIB
  PRIVATE bf::depsgraph
  PRIVATE bf::dna
  bf_editor_uvedit
+  PRIVATE bf::gpu
  PRIVATE bf::intern::clog
  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
  ../../blenloader
  ../../blentranslation
-  ../../gpu
  ../../imbuf
  ../../makesrna
  ../../windowmanager
@@ -37,6 +36,7 @@ set(LIB
  PRIVATE bf::bmesh
  PRIVATE bf::depsgraph
  PRIVATE bf::dna
+  PRIVATE bf::gpu
  PRIVATE bf::intern::guardedalloc
  PRIVATE bf::extern::fmtlib
 )
--- a/source/blender/editors/space_nla/CMakeLists.txt
+++ b/source/blender/editors/space_nla/CMakeLists.txt
@@ -6,7 +6,6 @@ set(INC
  ../include
  ../../blenloader
  ../../blentranslation
-  ../../gpu
  ../../makesrna
  ../../windowmanager

@@ -35,6 +34,7 @@ set(LIB
  PRIVATE bf::blenlib
  PRIVATE bf::depsgraph
  PRIVATE bf::dna
+  PRIVATE bf::gpu
  PRIVATE bf::intern::guardedalloc
 )

--- a/source/blender/editors/space_node/CMakeLists.txt
+++ b/source/blender/editors/space_node/CMakeLists.txt
@@ -12,7 +12,6 @@ set(INC
  ../../draw
  ../../functions
  ../../geometry
-  ../../gpu
  ../../imbuf
  ../../makesrna
  ../../nodes
@@ -57,6 +56,7 @@ set(LIB
  PRIVATE bf::depsgraph
  PRIVATE bf::dna
  bf_editor_screen
+  PRIVATE bf::gpu
  PRIVATE bf::intern::guardedalloc
  bf_compositor
  PRIVATE bf::extern::fmtlib
--- a/source/blender/editors/space_outliner/CMakeLists.txt
+++ b/source/blender/editors/space_outliner/CMakeLists.txt
@@ -7,7 +7,6 @@ set(INC
  ../../blenfont
  ../../blenloader
  ../../blentranslation
-  ../../gpu
  ../../imbuf
  ../../makesrna
  ../../sequencer
@@ -140,6 +139,7 @@ set(LIB
  PRIVATE bf::dna
  bf_editor_id_management
  bf_editor_undo
+  PRIVATE bf::gpu
  PRIVATE bf::intern::clog
  PRIVATE bf::intern::guardedalloc
  extern_fmtlib
--- a/source/blender/editors/space_script/CMakeLists.txt
+++ b/source/blender/editors/space_script/CMakeLists.txt
@@ -6,7 +6,6 @@ set(INC
  ../include
  ../../blenloader
  ../../blentranslation
-  ../../gpu
  ../../makesrna
  ../../windowmanager

@@ -27,6 +26,7 @@ set(LIB
  PRIVATE bf::blenkernel
  PRIVATE bf::blenlib
  PRIVATE bf::dna
+  PRIVATE bf::gpu
  PRIVATE bf::intern::guardedalloc
 )

--- a/source/blender/editors/space_sequencer/CMakeLists.txt
+++ b/source/blender/editors/space_sequencer/CMakeLists.txt
@@ -7,7 +7,6 @@ set(INC
  ../../blenloader
  ../../blentranslation
  ../../draw
-  ../../gpu
  ../../imbuf
  ../../imbuf/movie
  ../../makesrna
@@ -60,6 +59,7 @@ set(LIB
  PRIVATE bf::dna
  bf_editor_interface
  bf_editor_util
+  PRIVATE bf::gpu
  PRIVATE bf::intern::atomic
  PRIVATE bf::intern::guardedalloc
  PRIVATE bf::animrig
--- a/source/blender/editors/space_spreadsheet/CMakeLists.txt
+++ b/source/blender/editors/space_spreadsheet/CMakeLists.txt
@@ -7,7 +7,6 @@ set(INC
  ../../blenloader
  ../../blentranslation
  ../../functions
-  ../../gpu
  ../../makesrna
  ../../nodes
  ../../windowmanager
@@ -54,6 +53,7 @@ set(LIB
  PRIVATE bf::depsgraph
  PRIVATE bf::dna
  PRIVATE bf::extern::fmtlib
+  PRIVATE bf::gpu
  PRIVATE bf::intern::guardedalloc
 )

--- a/source/blender/editors/space_statusbar/CMakeLists.txt
+++ b/source/blender/editors/space_statusbar/CMakeLists.txt
@@ -6,7 +6,6 @@ set(INC
  ../include
  ../../blenloader
  ../../blentranslation
-  ../../gpu
  ../../makesrna
  ../../windowmanager

@@ -25,6 +24,7 @@ set(LIB
  PRIVATE bf::blenkernel
  PRIVATE bf::blenlib
  PRIVATE bf::dna
+  PRIVATE bf::gpu
  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
  ../../blenloader
  ../../blentranslation
-  ../../gpu
  ../../makesrna
  ../../windowmanager

@@ -38,6 +37,7 @@ set(LIB
  PRIVATE bf::blenkernel
  PRIVATE bf::blenlib
  PRIVATE bf::dna
+  PRIVATE bf::gpu
  PRIVATE bf::intern::guardedalloc
 )

--- a/source/blender/editors/space_topbar/CMakeLists.txt
+++ b/source/blender/editors/space_topbar/CMakeLists.txt
@@ -6,7 +6,6 @@ set(INC
  ../include
  ../../blenloader
  ../../blentranslation
-  ../../gpu
  ../../makesrna
  ../../windowmanager

@@ -25,6 +24,7 @@ set(LIB
  PRIVATE bf::blenkernel
  PRIVATE bf::blenlib
  PRIVATE bf::dna
+  PRIVATE bf::gpu
  PRIVATE bf::intern::guardedalloc
 )

--- a/source/blender/editors/space_view3d/CMakeLists.txt
+++ b/source/blender/editors/space_view3d/CMakeLists.txt
@@ -10,7 +10,6 @@ set(INC
  ../../blentranslation
  ../../draw
  ../../functions
-  ../../gpu
  ../../imbuf
  ../../makesrna
  ../../modifiers
@@ -90,6 +89,7 @@ set(LIB
  bf_editor_curves
  bf_editor_lattice
  bf_editor_mesh
+  PRIVATE bf::gpu
  PRIVATE bf::intern::guardedalloc
 )

--- a/source/blender/editors/transform/CMakeLists.txt
+++ b/source/blender/editors/transform/CMakeLists.txt
@@ -5,7 +5,6 @@
 set(INC
  ../include
  ../../blentranslation
-  ../../gpu
  ../../ikplugin
  ../../makesrna
  ../../render
@@ -119,7 +118,7 @@ set(LIB
  PRIVATE bf::depsgraph
  PRIVATE bf::dna
  bf_editor_mask
-  bf_gpu
+  PRIVATE bf::gpu
  PRIVATE bf::intern::guardedalloc
 )

--- a/source/blender/editors/util/CMakeLists.txt
+++ b/source/blender/editors/util/CMakeLists.txt
@@ -7,7 +7,6 @@ set(INC
  ../space_sequencer
  ../../asset_system
  ../../blentranslation
-  ../../gpu
  ../../imbuf
  ../../makesrna
  ../../sequencer
@@ -114,6 +113,7 @@ set(LIB
  PRIVATE bf::bmesh
  PRIVATE bf::depsgraph
  PRIVATE bf::dna
+  PRIVATE bf::gpu
  PRIVATE bf::intern::clog
  PRIVATE bf::intern::guardedalloc
 )
--- a/source/blender/editors/uvedit/CMakeLists.txt
+++ b/source/blender/editors/uvedit/CMakeLists.txt
@@ -6,7 +6,6 @@ set(INC
  ../include
  ../../blentranslation
  ../../geometry
-  ../../gpu
  ../../makesrna
  ../../windowmanager
  ../../../../intern/eigen
@@ -40,6 +39,7 @@ set(LIB
  PRIVATE bf::bmesh
  PRIVATE bf::depsgraph
  PRIVATE bf::dna
+  PRIVATE bf::gpu
  PRIVATE bf::intern::guardedalloc
 )

--- a/source/blender/gpu/CMakeLists.txt
+++ b/source/blender/gpu/CMakeLists.txt
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: GPL-2.0-or-later

 set(INC
-  .
+  PUBLIC .
  dummy
  intern
  metal
@@ -745,6 +745,7 @@ if(WITH_GTESTS)
 endif()

 blender_add_lib(bf_gpu "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
+add_library(bf::gpu ALIAS bf_gpu)
 target_link_libraries(bf_gpu PUBLIC
  bf_compositor_shaders
  bf_draw_shaders
--- a/source/blender/imbuf/CMakeLists.txt
+++ b/source/blender/imbuf/CMakeLists.txt
@@ -8,7 +8,6 @@ set(INC
  .
  ./movie
  ../blenloader
-  ../gpu
  ../makesrna
  ../sequencer
  ../../../intern/memutil
@@ -76,6 +75,7 @@ set(LIB
  PRIVATE bf::blenlib
  bf_blenloader
  PRIVATE bf::dna
+  PRIVATE bf::gpu
  bf_imbuf_openimageio
  PRIVATE bf::intern::guardedalloc
  bf_intern_memutil
--- a/source/blender/nodes/CMakeLists.txt
+++ b/source/blender/nodes/CMakeLists.txt
@@ -60,7 +60,6 @@ set(INC
  ../depsgraph
  ../functions
  ../geometry
-  ../gpu
  ../imbuf
  ../makesrna
  ../modifiers
@@ -145,6 +144,7 @@ set(LIB
  PRIVATE bf::depsgraph
  PRIVATE bf::dna
  bf_functions
+  PRIVATE bf::gpu
  PRIVATE bf::intern::guardedalloc
  bf_nodes_composite
  bf_nodes_function
--- a/source/blender/nodes/composite/CMakeLists.txt
+++ b/source/blender/nodes/composite/CMakeLists.txt
@@ -9,7 +9,6 @@ set(INC
  ../../editors/include
  ../../blentranslation
  ../../functions
-  ../../gpu
  ../../imbuf
  ../../makesrna
  ../../render
@@ -131,6 +130,7 @@ set(LIB
  PRIVATE bf::depsgraph
  PRIVATE bf::dna
  bf_functions
+  PRIVATE bf::gpu
  PRIVATE bf::intern::guardedalloc
  PRIVATE bf::extern::fmtlib
  bf_compositor
--- a/source/blender/nodes/geometry/CMakeLists.txt
+++ b/source/blender/nodes/geometry/CMakeLists.txt
@@ -12,7 +12,6 @@ set(INC
  ../../blentranslation
  ../../functions
  ../../geometry
-  ../../gpu
  ../../imbuf
  ../../imbuf/movie
  ../../makesrna
@@ -253,6 +252,7 @@ set(LIB
  PRIVATE bf::dna
  bf_functions
  bf_geometry
+  PRIVATE bf::gpu
  PRIVATE bf::intern::guardedalloc
  bf_nodes
  PRIVATE bf::intern::atomic
--- a/source/blender/nodes/shader/CMakeLists.txt
+++ b/source/blender/nodes/shader/CMakeLists.txt
@@ -9,7 +9,6 @@ set(INC
  ../../blentranslation
  ../../editors/include
  ../../functions
-  ../../gpu
  ../../imbuf
  ../../makesrna
  ../../render
@@ -133,6 +132,7 @@ set(LIB
  PRIVATE bf::depsgraph
  PRIVATE bf::dna
  bf_functions
+  PRIVATE bf::gpu
  PRIVATE bf::intern::clog
  PRIVATE bf::intern::guardedalloc
  bf_intern_sky
--- a/source/blender/python/generic/CMakeLists.txt
+++ b/source/blender/python/generic/CMakeLists.txt
@@ -4,7 +4,6 @@

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

@@ -43,6 +42,7 @@ set(LIB
  PRIVATE bf::blenkernel
  PRIVATE bf::blenlib
  PRIVATE bf::dna
+  PRIVATE bf::gpu
  PRIVATE bf::intern::clog
  PRIVATE bf::intern::guardedalloc
 )
--- a/source/blender/python/gpu/CMakeLists.txt
+++ b/source/blender/python/gpu/CMakeLists.txt
@@ -5,7 +5,6 @@
 set(INC
  .
  ../../editors/include
-  ../../gpu
  ../../imbuf
 )

@@ -62,6 +61,7 @@ set(LIB
  PRIVATE bf::blenkernel
  PRIVATE bf::blenlib
  PRIVATE bf::dna
+  PRIVATE bf::gpu
  PRIVATE bf::intern::guardedalloc
 )

--- a/source/blender/python/intern/CMakeLists.txt
+++ b/source/blender/python/intern/CMakeLists.txt
@@ -7,7 +7,6 @@ set(INC
  ../../blenloader
  ../../blentranslation
  ../../editors/include
-  ../../gpu
  ../../imbuf
  ../../imbuf/intern/oiio
  ../../makesrna
@@ -126,6 +125,7 @@ set(LIB
  bf_editor_animation
  bf_editor_interface
  bf_editor_space_api
+  PRIVATE bf::gpu
  PRIVATE bf::intern::clog
  PRIVATE bf::intern::guardedalloc
  PRIVATE bf::animrig
--- a/source/blender/render/CMakeLists.txt
+++ b/source/blender/render/CMakeLists.txt
@@ -11,7 +11,6 @@ set(INC
  ../compositor/cached_resources
  ../draw
  ../draw/intern
-  ../gpu
  ../gpu/intern
  ../imbuf
  ../imbuf/movie
@@ -65,6 +64,7 @@ set(LIB
  PRIVATE bf::depsgraph
  PRIVATE bf::dna
  PRIVATE bf::extern::fmtlib
+  PRIVATE bf::gpu
  PRIVATE bf::intern::guardedalloc
  bf_compositor
  PRIVATE bf::intern::atomic
--- a/source/blender/render/hydra/CMakeLists.txt
+++ b/source/blender/render/hydra/CMakeLists.txt
@@ -49,7 +49,6 @@ set(INC
  ../../makesrna
  ../../nodes
  ../../io/usd
-  ../../gpu
  ../../gpu/intern
  ../../python/intern
  # RNA_prototypes.hh
@@ -75,6 +74,7 @@ set(LIB
  ${TBB_LIBRARIES}
  PRIVATE bf::blenkernel
  PRIVATE bf::depsgraph
+  PRIVATE bf::gpu
  PRIVATE bf::intern::clog
  bf_io_usd
 )
--- a/source/blender/windowmanager/CMakeLists.txt
+++ b/source/blender/windowmanager/CMakeLists.txt
@@ -12,7 +12,6 @@ set(INC
  ../compositor
  ../editors/include
  ../draw
-  ../gpu
  ../imbuf
  ../imbuf/movie
  ../makesrna
@@ -104,6 +103,7 @@ set(LIB
  bf_editor_screen
  bf_editor_undo
  PRIVATE bf::extern::fmtlib
+  PRIVATE bf::gpu
  PRIVATE bf::intern::clog
  PRIVATE bf::intern::guardedalloc
  PRIVATE bf::animrig
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -4,7 +4,6 @@

 set(INC
  ../blender/editors/include
-  ../blender/gpu
  ../blender/imbuf
  ../blender/imbuf/movie
  ../blender/io/usd
@@ -19,6 +18,7 @@ set(LIB
  PRIVATE bf::bmesh
  PRIVATE bf::depsgraph
  PRIVATE bf::dna
+  PRIVATE bf::gpu
  PRIVATE bf::intern::clog
  PRIVATE bf::intern::guardedalloc
  bf_windowmanager