Cleanup: CMake: Modernize bf_windowmanager dependencies

Pretty straightforward - Remove any bf_windowmanager 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/132310
2024-12-24 22:40:38 +01:00
parent 0ba91e9870
commit 54604efdfd
71 changed files with 72 additions and 78 deletions
--- a/source/blender/animrig/CMakeLists.txt
+++ b/source/blender/animrig/CMakeLists.txt
@@ -9,7 +9,6 @@ set(INC
  ../blentranslation
  ../editors/include
  ../makesrna
-  ../windowmanager
  ../../../extern/fmtlib/include
  # RNA_prototypes.hh
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
@@ -67,6 +66,7 @@ set(LIB
  PRIVATE bf::intern::guardedalloc
  PRIVATE bf::intern::atomic
  PRIVATE bf::intern::clog
+  PRIVATE bf::windowmanager
 )

 blender_add_lib(bf_animrig "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
--- a/source/blender/blenloader/CMakeLists.txt
+++ b/source/blender/blenloader/CMakeLists.txt
@@ -13,7 +13,6 @@ set(INC
  ../nodes
  ../render
  ../sequencer
-  ../windowmanager

  # RNA_prototypes.hh
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
@@ -67,6 +66,7 @@ set(LIB
  PRIVATE bf::intern::guardedalloc
  PRIVATE bf::extern::fmtlib
  PRIVATE bf::intern::memutil
+  PRIVATE bf::windowmanager
 )

 if(WITH_BUILDINFO)
--- a/source/blender/depsgraph/CMakeLists.txt
+++ b/source/blender/depsgraph/CMakeLists.txt
@@ -10,7 +10,6 @@ set(INC
  ../makesrna
  ../modifiers
  ../sequencer
-  ../windowmanager
  # RNA_prototypes.hh
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
@@ -156,6 +155,7 @@ set(LIB
  PRIVATE bf::dna
  PRIVATE bf::intern::atomic
  PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )

 if(WITH_PYTHON)
--- a/source/blender/draw/CMakeLists.txt
+++ b/source/blender/draw/CMakeLists.txt
@@ -20,7 +20,6 @@ set(INC
  ../compositor
  ../compositor/algorithms
  ../compositor/cached_resources
-  ../windowmanager

  ../../../intern/opensubdiv
 )
@@ -311,7 +310,7 @@ set(LIB
  PRIVATE bf::intern::clog
  PRIVATE bf::intern::guardedalloc
  bf_compositor
-  bf_windowmanager
+  PRIVATE bf::windowmanager
  PRIVATE bf::intern::atomic
  PRIVATE bf::extern::fmtlib
 )
--- a/source/blender/editors/animation/CMakeLists.txt
+++ b/source/blender/editors/animation/CMakeLists.txt
@@ -7,7 +7,6 @@ set(INC
  ../../blentranslation
  ../../makesrna
  ../../sequencer
-  ../../windowmanager
  ../../../../extern/fmtlib/include
  # RNA_prototypes.hh
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
@@ -48,6 +47,7 @@ set(LIB
  PRIVATE bf::gpu
  PRIVATE bf::intern::clog
  PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )

 if(WITH_PYTHON)
--- a/source/blender/editors/armature/CMakeLists.txt
+++ b/source/blender/editors/armature/CMakeLists.txt
@@ -8,7 +8,6 @@ set(INC
  ../../blenloader
  ../../blentranslation
  ../../makesrna
-  ../../windowmanager
  ../../../../intern/eigen
  # RNA_prototypes.hh
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
@@ -51,6 +50,7 @@ set(LIB
  PRIVATE bf::gpu
  PRIVATE bf::intern::clog
  PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )


--- a/source/blender/editors/asset/CMakeLists.txt
+++ b/source/blender/editors/asset/CMakeLists.txt
@@ -9,7 +9,6 @@ set(INC
  ../../blenloader
  ../../blentranslation
  ../../makesrna
-  ../../windowmanager
  # dna_type_offsets.h
  ${CMAKE_CURRENT_BINARY_DIR}/../../makesdna/intern
  # RNA_prototypes.hh
@@ -62,6 +61,7 @@ set(LIB
  PRIVATE bf::dna
  PRIVATE bf::intern::clog
  PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )

 blender_add_lib(bf_editor_asset "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
--- a/source/blender/editors/curve/CMakeLists.txt
+++ b/source/blender/editors/curve/CMakeLists.txt
@@ -6,7 +6,6 @@ set(INC
  ../include
  ../../blentranslation
  ../../makesrna
-  ../../windowmanager
  # RNA_prototypes.hh
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
@@ -39,6 +38,7 @@ set(LIB
  PRIVATE bf::gpu
  PRIVATE bf::intern::clog
  PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )

 blender_add_lib(bf_editor_curve "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
--- a/source/blender/editors/curves/CMakeLists.txt
+++ b/source/blender/editors/curves/CMakeLists.txt
@@ -8,7 +8,6 @@ set(INC
  ../../functions
  ../../geometry
  ../../makesrna
-  ../../windowmanager

  # RNA_prototypes.hh
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
@@ -42,6 +41,7 @@ set(LIB
  PRIVATE bf::gpu
  PRIVATE bf::intern::clog
  PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )

 if(WITH_TBB)
--- a/source/blender/editors/geometry/CMakeLists.txt
+++ b/source/blender/editors/geometry/CMakeLists.txt
@@ -9,7 +9,6 @@ set(INC
  ../../functions
  ../../makesrna
  ../../nodes
-  ../../windowmanager

  # RNA_prototypes.hh
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
@@ -36,7 +35,7 @@ set(LIB
  bf_editor_object
  PRIVATE bf::extern::fmtlib
  PRIVATE bf::intern::guardedalloc
-  bf_windowmanager
+  PRIVATE bf::windowmanager
 )

 blender_add_lib(bf_editor_geometry "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
--- a/source/blender/editors/gizmo_library/CMakeLists.txt
+++ b/source/blender/editors/gizmo_library/CMakeLists.txt
@@ -6,7 +6,6 @@ set(INC
  ../include
  ../../blentranslation
  ../../makesrna
-  ../../windowmanager
  ../../../../intern/eigen
  # RNA_prototypes.hh
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
@@ -44,6 +43,7 @@ set(LIB
  PRIVATE bf::gpu
  PRIVATE bf::intern::clog
  PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )


--- a/source/blender/editors/gpencil_legacy/CMakeLists.txt
+++ b/source/blender/editors/gpencil_legacy/CMakeLists.txt
@@ -7,7 +7,6 @@ set(INC
  ../../blentranslation
  ../../imbuf
  ../../makesrna
-  ../../windowmanager
  # RNA_prototypes.hh
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
@@ -38,6 +37,7 @@ set(LIB
  PRIVATE bf::dna
  PRIVATE bf::gpu
  PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )


--- a/source/blender/editors/grease_pencil/CMakeLists.txt
+++ b/source/blender/editors/grease_pencil/CMakeLists.txt
@@ -7,7 +7,6 @@ set(INC
  ../../blentranslation
  ../../imbuf
  ../../makesrna
-  ../../windowmanager
  ../../../../extern/curve_fit_nd
  ../../geometry
  ../sculpt_paint
@@ -53,6 +52,7 @@ set(LIB
  PRIVATE bf::gpu
  PRIVATE bf::intern::guardedalloc
  PRIVATE bf::intern::clog
+  PRIVATE bf::windowmanager
  extern_curve_fit_nd
  extern_fmtlib
 )
--- a/source/blender/editors/id_management/CMakeLists.txt
+++ b/source/blender/editors/id_management/CMakeLists.txt
@@ -5,7 +5,6 @@
 set(INC
  ../include
  ../../makesrna
-  ../../windowmanager
 )

 set(INC_SYS
@@ -17,7 +16,7 @@ set(SRC

 set(LIB
  PRIVATE bf::blenkernel
-  bf_windowmanager
+  PRIVATE bf::windowmanager
  PRIVATE bf::blenlib
  PRIVATE bf::dna
  PRIVATE bf::intern::clog
--- a/source/blender/editors/interface/CMakeLists.txt
+++ b/source/blender/editors/interface/CMakeLists.txt
@@ -17,7 +17,6 @@ set(INC
  ../../nodes
  ../../python
  ../../render
-  ../../windowmanager
  ../../../../intern/ghost
  # RNA_prototypes.hh
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
@@ -110,6 +109,7 @@ set(LIB
  PRIVATE bf::gpu
  PRIVATE bf::intern::guardedalloc
  PRIVATE bf::animrig
+  PRIVATE bf::windowmanager
 )

 if(WITH_INTERNATIONAL)
--- a/source/blender/editors/io/CMakeLists.txt
+++ b/source/blender/editors/io/CMakeLists.txt
@@ -14,7 +14,6 @@ set(INC
  ../../io/usd
  ../../io/wavefront_obj
  ../../makesrna
-  ../../windowmanager
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )

@@ -57,6 +56,7 @@ set(LIB
  PRIVATE bf::extern::fmtlib
  PRIVATE bf::intern::guardedalloc
  PRIVATE bf::intern::clog
+  PRIVATE bf::windowmanager
 )

 if(WITH_OPENCOLLADA)
--- a/source/blender/editors/lattice/CMakeLists.txt
+++ b/source/blender/editors/lattice/CMakeLists.txt
@@ -6,7 +6,6 @@ set(INC
  ../include
  ../../makesrna
  ../../render
-  ../../windowmanager
 )

 set(INC_SYS
@@ -29,6 +28,7 @@ set(LIB
  PRIVATE bf::dna
  PRIVATE bf::intern::clog
  PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )

 blender_add_lib(bf_editor_lattice "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
--- a/source/blender/editors/mask/CMakeLists.txt
+++ b/source/blender/editors/mask/CMakeLists.txt
@@ -6,7 +6,6 @@ set(INC
  ../include
  ../../blentranslation
  ../../makesrna
-  ../../windowmanager
 )

 set(INC_SYS
@@ -34,6 +33,7 @@ set(LIB
  PRIVATE bf::gpu
  PRIVATE bf::intern::guardedalloc
  PRIVATE bf::animrig
+  PRIVATE bf::windowmanager
 )


--- a/source/blender/editors/mesh/CMakeLists.txt
+++ b/source/blender/editors/mesh/CMakeLists.txt
@@ -12,7 +12,6 @@ set(INC
  ../../imbuf
  ../../makesrna
  ../../render
-  ../../windowmanager
  # RNA_prototypes.hh
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
@@ -69,7 +68,7 @@ set(LIB
  PRIVATE bf::gpu
  PRIVATE bf::intern::clog
  PRIVATE bf::intern::guardedalloc
-  bf_windowmanager
+  PRIVATE bf::windowmanager
 )

 if(WITH_FREESTYLE)
--- a/source/blender/editors/metaball/CMakeLists.txt
+++ b/source/blender/editors/metaball/CMakeLists.txt
@@ -7,7 +7,6 @@ set(INC
  ../../blentranslation
  ../../makesrna
  ../../render
-  ../../windowmanager
 )

 set(INC_SYS
@@ -30,6 +29,7 @@ set(LIB
  PRIVATE bf::gpu
  PRIVATE bf::intern::clog
  PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )

 blender_add_lib(bf_editor_metaball "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
--- a/source/blender/editors/object/CMakeLists.txt
+++ b/source/blender/editors/object/CMakeLists.txt
@@ -15,7 +15,6 @@ set(INC
  ../../python
  ../../render
  ../../shader_fx
-  ../../windowmanager

  # RNA_prototypes.hh
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
@@ -72,7 +71,7 @@ set(LIB
  PRIVATE bf::intern::clog
  PRIVATE bf::intern::guardedalloc
  bf_render
-  bf_windowmanager
+  PRIVATE bf::windowmanager
 )


--- a/source/blender/editors/physics/CMakeLists.txt
+++ b/source/blender/editors/physics/CMakeLists.txt
@@ -6,7 +6,6 @@ set(INC
  ../include
  ../../blentranslation
  ../../makesrna
-  ../../windowmanager
  ../../../../intern/mantaflow/extern
  # RNA_prototypes.hh
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
@@ -40,6 +39,7 @@ set(LIB
  PRIVATE bf::gpu
  PRIVATE bf::intern::clog
  PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )

 if(WITH_MOD_FLUID)
--- a/source/blender/editors/render/CMakeLists.txt
+++ b/source/blender/editors/render/CMakeLists.txt
@@ -13,7 +13,6 @@ set(INC
  ../../nodes
  ../../render
  ../../sequencer
-  ../../windowmanager
  # RNA_prototypes.hh
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
@@ -43,6 +42,7 @@ set(LIB
  PRIVATE bf::gpu
  PRIVATE bf::intern::guardedalloc
  PRIVATE bf::animrig
+  PRIVATE bf::windowmanager
 )

 if(WITH_HEADLESS)
--- a/source/blender/editors/scene/CMakeLists.txt
+++ b/source/blender/editors/scene/CMakeLists.txt
@@ -7,7 +7,6 @@ set(INC
  ../../blentranslation
  ../../makesrna
  ../../sequencer
-  ../../windowmanager
 )

 set(INC_SYS
@@ -25,6 +24,7 @@ set(LIB
  PRIVATE bf::depsgraph
  PRIVATE bf::dna
  PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )


--- a/source/blender/editors/screen/CMakeLists.txt
+++ b/source/blender/editors/screen/CMakeLists.txt
@@ -11,7 +11,6 @@ set(INC
  ../../imbuf
  ../../makesrna
  ../../sequencer
-  ../../windowmanager
  ../../../../extern/fmtlib/include
  # RNA_prototypes.hh
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
@@ -52,6 +51,7 @@ set(LIB
  PRIVATE bf::gpu
  PRIVATE bf::intern::guardedalloc
  PRIVATE bf::extern::fmtlib
+  PRIVATE bf::windowmanager
 )

 if(WITH_HEADLESS)
--- a/source/blender/editors/sculpt_paint/CMakeLists.txt
+++ b/source/blender/editors/sculpt_paint/CMakeLists.txt
@@ -19,7 +19,6 @@ set(INC
  ../../makesrna
  ../../nodes
  ../../render
-  ../../windowmanager
  ../../../../intern/eigen
  # RNA_prototypes.hh
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
@@ -188,6 +187,7 @@ set(LIB
  PRIVATE bf::intern::atomic
  PRIVATE bf::intern::clog
  PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )

 if(WITH_POTRACE)
--- a/source/blender/editors/sound/CMakeLists.txt
+++ b/source/blender/editors/sound/CMakeLists.txt
@@ -6,7 +6,6 @@ set(INC
  ../include
  ../../makesrna
  ../../sequencer
-  ../../windowmanager
  # RNA_prototypes.hh
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
@@ -27,6 +26,7 @@ set(LIB
  PRIVATE bf::depsgraph
  PRIVATE bf::dna
  PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )

 if(WITH_AUDASPACE)
--- a/source/blender/editors/space_action/CMakeLists.txt
+++ b/source/blender/editors/space_action/CMakeLists.txt
@@ -8,7 +8,6 @@ set(INC
  ../../blentranslation
  ../../makesrna
  ../../modifiers
-  ../../windowmanager

  # RNA_prototypes.hh
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
@@ -38,6 +37,7 @@ set(LIB
  PRIVATE bf::gpu
  PRIVATE bf::intern::guardedalloc
  PRIVATE bf::animrig
+  PRIVATE bf::windowmanager
 )

 blender_add_lib(bf_editor_space_action "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
--- 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
  ../../makesrna
-  ../../windowmanager
 )

 set(INC_SYS
@@ -44,6 +43,7 @@ set(LIB
  bf_editor_space_view3d
  PRIVATE bf::gpu
  PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )

 blender_add_lib(bf_editor_space_api "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
--- a/source/blender/editors/space_buttons/CMakeLists.txt
+++ b/source/blender/editors/space_buttons/CMakeLists.txt
@@ -7,7 +7,6 @@ set(INC
  ../../blenloader
  ../../blentranslation
  ../../makesrna
-  ../../windowmanager

  # RNA_prototypes.hh
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
@@ -32,6 +31,7 @@ set(LIB
  PRIVATE bf::dna
  PRIVATE bf::gpu
  PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )


--- a/source/blender/editors/space_clip/CMakeLists.txt
+++ b/source/blender/editors/space_clip/CMakeLists.txt
@@ -9,7 +9,6 @@ set(INC
  ../../imbuf
  ../../imbuf/movie
  ../../makesrna
-  ../../windowmanager

  # RNA_prototypes.hh
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
@@ -51,6 +50,7 @@ set(LIB
  PRIVATE bf::dna
  PRIVATE bf::gpu
  PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )

 blender_add_lib(bf_editor_space_clip "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
--- a/source/blender/editors/space_console/CMakeLists.txt
+++ b/source/blender/editors/space_console/CMakeLists.txt
@@ -6,7 +6,6 @@ set(INC
  ../include
  ../../blenloader
  ../../makesrna
-  ../../windowmanager

 )

@@ -28,6 +27,7 @@ set(LIB
  PRIVATE bf::dna
  PRIVATE bf::gpu
  PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )

 if(WITH_PYTHON)
--- a/source/blender/editors/space_file/CMakeLists.txt
+++ b/source/blender/editors/space_file/CMakeLists.txt
@@ -12,7 +12,6 @@ set(INC
  ../../imbuf/movie
  ../../makesrna
  ../../render
-  ../../windowmanager

  # RNA_prototypes.hh
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
@@ -51,6 +50,7 @@ set(LIB
  PRIVATE bf::intern::guardedalloc
  PRIVATE bf::extern::fmtlib
  PRIVATE bf::intern::atomic
+  PRIVATE bf::windowmanager
 )

 if(WIN32)
--- a/source/blender/editors/space_graph/CMakeLists.txt
+++ b/source/blender/editors/space_graph/CMakeLists.txt
@@ -7,7 +7,6 @@ set(INC
  ../../blenloader
  ../../blentranslation
  ../../makesrna
-  ../../windowmanager

  # RNA_prototypes.hh
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
@@ -38,6 +37,7 @@ set(LIB
  PRIVATE bf::gpu
  PRIVATE bf::intern::guardedalloc
  PRIVATE bf::animrig
+  PRIVATE bf::windowmanager
 )

 if(WITH_AUDASPACE)
--- a/source/blender/editors/space_image/CMakeLists.txt
+++ b/source/blender/editors/space_image/CMakeLists.txt
@@ -12,7 +12,6 @@ set(INC
  ../../imbuf/movie
  ../../makesrna
  ../../render
-  ../../windowmanager

  # RNA_prototypes.hh
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
@@ -44,6 +43,7 @@ set(LIB
  PRIVATE bf::gpu
  PRIVATE bf::intern::clog
  PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )

 if(WITH_IMAGE_OPENJPEG)
--- a/source/blender/editors/space_info/CMakeLists.txt
+++ b/source/blender/editors/space_info/CMakeLists.txt
@@ -8,7 +8,6 @@ set(INC
  ../../blentranslation
  ../../imbuf
  ../../makesrna
-  ../../windowmanager

  # RNA_prototypes.hh
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
@@ -39,6 +38,7 @@ set(LIB
  PRIVATE bf::gpu
  PRIVATE bf::intern::guardedalloc
  PRIVATE bf::extern::fmtlib
+  PRIVATE bf::windowmanager
 )


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

  # RNA_prototypes.hh
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
@@ -36,6 +35,7 @@ set(LIB
  PRIVATE bf::dna
  PRIVATE bf::gpu
  PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )

 blender_add_lib(bf_editor_space_nla "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
--- a/source/blender/editors/space_node/CMakeLists.txt
+++ b/source/blender/editors/space_node/CMakeLists.txt
@@ -16,7 +16,6 @@ set(INC
  ../../makesrna
  ../../nodes
  ../../render
-  ../../windowmanager

  # RNA_prototypes.hh
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
@@ -60,6 +59,7 @@ set(LIB
  PRIVATE bf::intern::guardedalloc
  bf_compositor
  PRIVATE bf::extern::fmtlib
+  PRIVATE bf::windowmanager
 )

 if(WITH_OPENIMAGEDENOISE)
--- a/source/blender/editors/space_outliner/CMakeLists.txt
+++ b/source/blender/editors/space_outliner/CMakeLists.txt
@@ -10,7 +10,6 @@ set(INC
  ../../imbuf
  ../../makesrna
  ../../sequencer
-  ../../windowmanager

  ../../../../extern/fmtlib/include

@@ -142,6 +141,7 @@ set(LIB
  PRIVATE bf::gpu
  PRIVATE bf::intern::clog
  PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
  extern_fmtlib
 )

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

 )

@@ -28,6 +27,7 @@ set(LIB
  PRIVATE bf::dna
  PRIVATE bf::gpu
  PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )

 if(WITH_PYTHON)
--- a/source/blender/editors/space_sequencer/CMakeLists.txt
+++ b/source/blender/editors/space_sequencer/CMakeLists.txt
@@ -11,7 +11,6 @@ set(INC
  ../../imbuf/movie
  ../../makesrna
  ../../sequencer
-  ../../windowmanager

  # RNA_prototypes.hh
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
@@ -63,6 +62,7 @@ set(LIB
  PRIVATE bf::intern::atomic
  PRIVATE bf::intern::guardedalloc
  PRIVATE bf::animrig
+  PRIVATE bf::windowmanager
 )

 if(WITH_AUDASPACE)
--- a/source/blender/editors/space_spreadsheet/CMakeLists.txt
+++ b/source/blender/editors/space_spreadsheet/CMakeLists.txt
@@ -9,7 +9,6 @@ set(INC
  ../../functions
  ../../makesrna
  ../../nodes
-  ../../windowmanager

  # RNA_prototypes.hh
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
@@ -55,6 +54,7 @@ set(LIB
  PRIVATE bf::extern::fmtlib
  PRIVATE bf::gpu
  PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )

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

  # RNA_prototypes.hh
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
@@ -26,6 +25,7 @@ set(LIB
  PRIVATE bf::dna
  PRIVATE bf::gpu
  PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )


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

 )

@@ -39,6 +38,7 @@ set(LIB
  PRIVATE bf::dna
  PRIVATE bf::gpu
  PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )


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

  # RNA_prototypes.hh
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
@@ -26,6 +25,7 @@ set(LIB
  PRIVATE bf::dna
  PRIVATE bf::gpu
  PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )


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

  # RNA_prototypes.hh
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
@@ -31,7 +30,7 @@ set(LIB
  PRIVATE bf::dna
  PRIVATE bf::extern::fmtlib
  PRIVATE bf::intern::guardedalloc
-  bf_windowmanager
+  PRIVATE bf::windowmanager
 )

 blender_add_lib(bf_editor_space_userpref "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
--- a/source/blender/editors/space_view3d/CMakeLists.txt
+++ b/source/blender/editors/space_view3d/CMakeLists.txt
@@ -15,7 +15,6 @@ set(INC
  ../../modifiers
  ../../nodes
  ../../render
-  ../../windowmanager
  ../../../../intern/mantaflow/extern

  # RNA_prototypes.hh
@@ -91,6 +90,7 @@ set(LIB
  bf_editor_mesh
  PRIVATE bf::gpu
  PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )

 if(WITH_PYTHON)
--- a/source/blender/editors/transform/CMakeLists.txt
+++ b/source/blender/editors/transform/CMakeLists.txt
@@ -9,7 +9,6 @@ set(INC
  ../../makesrna
  ../../render
  ../../sequencer
-  ../../windowmanager
  # RNA_prototypes.hh
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
@@ -120,6 +119,7 @@ set(LIB
  bf_editor_mask
  PRIVATE bf::gpu
  PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )

 blender_add_lib(bf_editor_transform "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
--- a/source/blender/editors/undo/CMakeLists.txt
+++ b/source/blender/editors/undo/CMakeLists.txt
@@ -8,7 +8,6 @@ set(INC
  ../../blenloader
  ../../blentranslation
  ../../makesrna
-  ../../windowmanager
 )

 set(INC_SYS
@@ -29,6 +28,7 @@ set(LIB
  PRIVATE bf::dna
  PRIVATE bf::intern::clog
  PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )

 blender_add_lib(bf_editor_undo "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
--- a/source/blender/editors/util/CMakeLists.txt
+++ b/source/blender/editors/util/CMakeLists.txt
@@ -10,7 +10,6 @@ set(INC
  ../../imbuf
  ../../makesrna
  ../../sequencer
-  ../../windowmanager
  # RNA_prototypes.hh
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
@@ -116,6 +115,7 @@ set(LIB
  PRIVATE bf::gpu
  PRIVATE bf::intern::clog
  PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )


--- a/source/blender/editors/uvedit/CMakeLists.txt
+++ b/source/blender/editors/uvedit/CMakeLists.txt
@@ -7,7 +7,6 @@ set(INC
  ../../blentranslation
  ../../geometry
  ../../makesrna
-  ../../windowmanager
  ../../../../intern/eigen
  # RNA_prototypes.hh
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
@@ -41,6 +40,7 @@ set(LIB
  PRIVATE bf::dna
  PRIVATE bf::gpu
  PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )

 if(WITH_UV_SLIM)
--- a/source/blender/io/alembic/CMakeLists.txt
+++ b/source/blender/io/alembic/CMakeLists.txt
@@ -9,7 +9,6 @@ set(INC
  ../../blentranslation
  ../../editors/include
  ../../makesrna
-  ../../windowmanager
  ../../../../intern/utfconv
 )

@@ -93,6 +92,7 @@ set(LIB

  ${ALEMBIC_LIBRARIES}
  ${OPENEXR_LIBRARIES}
+  PRIVATE bf::windowmanager
 )

 if(WITH_BOOST)
--- a/source/blender/io/collada/CMakeLists.txt
+++ b/source/blender/io/collada/CMakeLists.txt
@@ -26,7 +26,6 @@ set(INC
  ../../ikplugin
  ../../imbuf
  ../../makesrna
-  ../../windowmanager
  ../../../../intern/iksolver/extern
 )

@@ -118,6 +117,7 @@ set(LIB
  PRIVATE bf::depsgraph
  PRIVATE bf::dna
  PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )

 if(WITH_BUILDINFO)
--- a/source/blender/io/grease_pencil/CMakeLists.txt
+++ b/source/blender/io/grease_pencil/CMakeLists.txt
@@ -11,7 +11,6 @@ set(INC
  ../../geometry
  ../../makesdna
  ../../makesrna
-  ../../windowmanager
  ../../../../intern/guardedalloc
  ../../../../intern/utfconv
  ../../../../extern/fmtlib/include
@@ -37,6 +36,7 @@ set(LIB
  PRIVATE bf::extern::nanosvg
  PRIVATE bf::intern::clog
  PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
  PRIVATE extern_fmtlib
  bf_io_common
 )
--- a/source/blender/io/ply/CMakeLists.txt
+++ b/source/blender/io/ply/CMakeLists.txt
@@ -10,7 +10,6 @@ set(INC
  ../common
  ../../geometry
  ../../makesrna
-  ../../windowmanager
 )

 set(INC_SYS
@@ -57,6 +56,7 @@ set(LIB
  PRIVATE bf::intern::guardedalloc
  bf_io_common
  PRIVATE bf::extern::fmtlib
+  PRIVATE bf::windowmanager
 )

 blender_add_lib(bf_io_ply "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
--- a/source/blender/io/stl/CMakeLists.txt
+++ b/source/blender/io/stl/CMakeLists.txt
@@ -10,7 +10,6 @@ set(INC
  ../common
  ../../editors/include
  ../../makesrna
-  ../../windowmanager
 )

 set(INC_SYS
@@ -47,6 +46,7 @@ set(LIB
  PRIVATE bf::intern::guardedalloc
  bf_io_common
  PRIVATE bf::extern::fmtlib
+  PRIVATE bf::windowmanager
 )

 blender_add_lib(bf_io_stl "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
--- a/source/blender/io/usd/CMakeLists.txt
+++ b/source/blender/io/usd/CMakeLists.txt
@@ -51,7 +51,6 @@ set(INC
  ../../makesrna
  ../../nodes
  ../../python/intern
-  ../../windowmanager
  ../../../../intern/utfconv
  # RNA_prototypes.hh
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
@@ -204,6 +203,7 @@ set(LIB
  PRIVATE bf::intern::guardedalloc
  bf_io_common
  PRIVATE bf::extern::fmtlib
+  PRIVATE bf::windowmanager
 )

 list(APPEND LIB
--- a/source/blender/io/wavefront_obj/CMakeLists.txt
+++ b/source/blender/io/wavefront_obj/CMakeLists.txt
@@ -11,7 +11,6 @@ set(INC
  ../../editors/include
  ../../makesrna
  ../../nodes
-  ../../windowmanager
 )

 set(INC_SYS
@@ -60,6 +59,7 @@ set(LIB
  PRIVATE bf::intern::guardedalloc
  bf_io_common
  PRIVATE bf::extern::fmtlib
+  PRIVATE bf::windowmanager
 )

 blender_add_lib(bf_io_wavefront_obj "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
--- a/source/blender/modifiers/CMakeLists.txt
+++ b/source/blender/modifiers/CMakeLists.txt
@@ -14,7 +14,6 @@ set(INC
  ../makesrna
  ../nodes
  ../render
-  ../windowmanager
  ../../../intern/eigen

  # RNA_prototypes.hh
@@ -146,6 +145,7 @@ set(LIB
  PUBLIC bf::dna
  PRIVATE bf::intern::guardedalloc
  PRIVATE bf::extern::fmtlib
+  PRIVATE bf::windowmanager
 )

 if(WITH_ALEMBIC)
--- a/source/blender/nodes/CMakeLists.txt
+++ b/source/blender/nodes/CMakeLists.txt
@@ -64,7 +64,6 @@ set(INC
  ../makesrna
  ../modifiers
  ../render
-  ../windowmanager

  # RNA_prototypes.hh
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
@@ -153,6 +152,7 @@ set(LIB
  bf_nodes_texture
  PRIVATE bf::extern::fmtlib
  PRIVATE bf::extern::xxhash
+  PRIVATE bf::windowmanager
 )

 if(WITH_BULLET)
--- a/source/blender/nodes/composite/CMakeLists.txt
+++ b/source/blender/nodes/composite/CMakeLists.txt
@@ -12,7 +12,6 @@ set(INC
  ../../imbuf
  ../../makesrna
  ../../render
-  ../../windowmanager
  ../../compositor
  ../../compositor/algorithms
  ../../compositor/cached_resources
@@ -134,6 +133,7 @@ set(LIB
  PRIVATE bf::intern::guardedalloc
  PRIVATE bf::extern::fmtlib
  bf_compositor
+  PRIVATE bf::windowmanager
 )

 if(WITH_OPENCOLORIO)
--- a/source/blender/nodes/function/CMakeLists.txt
+++ b/source/blender/nodes/function/CMakeLists.txt
@@ -10,7 +10,6 @@ set(INC
  ../../editors/include
  ../../functions
  ../../makesrna
-  ../../windowmanager
 )

 set(INC_SYS
@@ -73,6 +72,7 @@ set(LIB
  PRIVATE bf::dna
  bf_functions
  PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )

 add_node_discovery(
--- a/source/blender/nodes/geometry/CMakeLists.txt
+++ b/source/blender/nodes/geometry/CMakeLists.txt
@@ -17,7 +17,6 @@ set(INC
  ../../makesrna
  ../../modifiers
  ../../render
-  ../../windowmanager
  ../../io/common
  ../../io/ply
  ../../io/stl
@@ -258,6 +257,7 @@ set(LIB
  PRIVATE bf::intern::atomic
  PRIVATE bf::extern::fmtlib
  PRIVATE bf::extern::xxhash
+  PRIVATE bf::windowmanager
 )

 if(WITH_IO_STL)
--- a/source/blender/nodes/shader/CMakeLists.txt
+++ b/source/blender/nodes/shader/CMakeLists.txt
@@ -12,7 +12,6 @@ set(INC
  ../../imbuf
  ../../makesrna
  ../../render
-  ../../windowmanager
  ../../../../intern/sky/include
  # RNA_prototypes.hh
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
@@ -137,6 +136,7 @@ set(LIB
  PRIVATE bf::intern::guardedalloc
  bf_intern_sky
  bf_nodes
+  PRIVATE bf::windowmanager
 )

 if(WITH_MATERIALX)
--- a/source/blender/nodes/texture/CMakeLists.txt
+++ b/source/blender/nodes/texture/CMakeLists.txt
@@ -11,7 +11,6 @@ set(INC
  ../../imbuf
  ../../makesrna
  ../../render
-  ../../windowmanager
  # RNA_prototypes.hh
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
@@ -62,6 +61,7 @@ set(LIB
  PRIVATE bf::dna
  PRIVATE bf::intern::guardedalloc
  bf_nodes
+  PRIVATE bf::windowmanager
 )

 blender_add_lib(bf_nodes_texture "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
--- a/source/blender/python/intern/CMakeLists.txt
+++ b/source/blender/python/intern/CMakeLists.txt
@@ -10,7 +10,6 @@ set(INC
  ../../imbuf
  ../../imbuf/intern/oiio
  ../../makesrna
-  ../../windowmanager
  ../../../../intern/mantaflow/extern
  ../../../../intern/opencolorio
  # RNA_prototypes.hh
@@ -133,6 +132,7 @@ set(LIB

  ${PYTHON_LINKFLAGS}
  ${PYTHON_LIBRARIES}
+  PRIVATE bf::windowmanager
 )

 # Only to check if `buildinfo` is available.
--- a/source/blender/render/CMakeLists.txt
+++ b/source/blender/render/CMakeLists.txt
@@ -18,7 +18,6 @@ set(INC
  ../nodes
  ../sequencer
  ../simulation
-  ../windowmanager
  ../../../intern/mikktspace
  ../../../intern/mantaflow/extern
 )
@@ -68,6 +67,7 @@ set(LIB
  PRIVATE bf::intern::guardedalloc
  bf_compositor
  PRIVATE bf::intern::atomic
+  PRIVATE bf::windowmanager
 )

 if(WITH_PYTHON)
--- a/source/blender/sequencer/CMakeLists.txt
+++ b/source/blender/sequencer/CMakeLists.txt
@@ -12,7 +12,6 @@ set(INC
  ../imbuf/movie
  ../makesrna
  ../render
-  ../windowmanager

  # RNA_prototypes.hh
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
@@ -91,6 +90,7 @@ set(LIB
  PRIVATE bf::intern::atomic
  PRIVATE bf::intern::clog
  PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )

 if(WITH_AUDASPACE)
--- a/source/blender/shader_fx/CMakeLists.txt
+++ b/source/blender/shader_fx/CMakeLists.txt
@@ -9,7 +9,6 @@ set(INC
  ../editors/include
  ../makesrna
  ../render
-  ../windowmanager
  ../../../intern/eigen
  # RNA_prototypes.hh
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
@@ -46,6 +45,7 @@ set(LIB
  PRIVATE bf::depsgraph
  PRIVATE bf::dna
  PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )


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

 set(INC
-  .
+  PUBLIC .
  gizmo
  gizmo/intern
  ../asset_system
@@ -204,6 +204,7 @@ if(WITH_XR_OPENXR)
 endif()

 blender_add_lib_nolist(bf_windowmanager "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
+add_library(bf::windowmanager ALIAS bf_windowmanager)

 # RNA_prototypes.hh
 add_dependencies(bf_windowmanager bf_rna)
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -9,7 +9,6 @@ set(INC
  ../blender/io/usd
  ../blender/makesrna
  ../blender/render
-  ../blender/windowmanager
 )

 set(LIB
@@ -21,7 +20,7 @@ set(LIB
  PRIVATE bf::gpu
  PRIVATE bf::intern::clog
  PRIVATE bf::intern::guardedalloc
-  bf_windowmanager
+  PRIVATE bf::windowmanager
 )

 if(HAVE_FEENABLEEXCEPT)