Cleanup: CMake: Modernize bf_windowmanager dependencies

Pretty straightforward - Remove any windowmanager paths from INC - Add a dependency though LIB when needed context: https://devtalk.blender.org/t/cmake-cleanup/30260 Pull Request: https://projects.blender.org/blender/blender/pulls/109984
2023-07-20 18:52:52 +02:00
parent f10fdcd0e8
commit 4e64b772f5
71 changed files with 74 additions and 78 deletions
--- a/source/blender/blenloader/CMakeLists.txt
+++ b/source/blender/blenloader/CMakeLists.txt
@@ -15,7 +15,6 @@ set(INC
  ../nodes
  ../render
  ../sequencer
-  ../windowmanager
  ../../../intern/clog
  ../bmesh

@@ -63,6 +62,7 @@ set(LIB
  PRIVATE bf::blenlib
  PRIVATE bf::dna
  PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )

 if(WITH_BUILDINFO)
--- a/source/blender/compositor/CMakeLists.txt
+++ b/source/blender/compositor/CMakeLists.txt
@@ -15,7 +15,6 @@ if(WITH_COMPOSITOR_CPU)
    ../imbuf
    ../makesrna
    ../nodes
-    ../windowmanager
    ../nodes/composite
    ../nodes/intern
    ../render
@@ -597,6 +596,7 @@ if(WITH_COMPOSITOR_CPU)
    PRIVATE bf::blenlib
    PRIVATE bf::dna
    PRIVATE bf::intern::guardedalloc
+    PRIVATE bf::windowmanager
    extern_clew
    PRIVATE bf::intern::atomic
  )
--- a/source/blender/depsgraph/CMakeLists.txt
+++ b/source/blender/depsgraph/CMakeLists.txt
@@ -10,7 +10,6 @@ set(INC
  ../makesrna
  ../modifiers
  ../sequencer
-  ../windowmanager
  # RNA_prototypes.h
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
@@ -155,6 +154,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
@@ -24,7 +24,6 @@ set(INC
  ../compositor/realtime_compositor
  ../compositor/realtime_compositor/algorithms
  ../compositor/realtime_compositor/cached_resources
-  ../windowmanager

  ../../../intern/clog
  ../../../intern/opensubdiv
@@ -356,7 +355,7 @@ set(LIB
  PRIVATE bf::dna
  PRIVATE bf::intern::guardedalloc
  bf_realtime_compositor
-  bf_windowmanager
+  PRIVATE bf::windowmanager
  PRIVATE bf::intern::atomic
 )

--- a/source/blender/editors/animation/CMakeLists.txt
+++ b/source/blender/editors/animation/CMakeLists.txt
@@ -9,7 +9,6 @@ set(INC
  ../../gpu
  ../../makesrna
  ../../sequencer
-  ../../windowmanager
  ../../../../intern/clog
  # RNA_prototypes.h
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
@@ -46,6 +45,7 @@ set(LIB
  PRIVATE bf::blenlib
  PRIVATE bf::dna
  PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )

 if(WITH_PYTHON)
--- a/source/blender/editors/armature/CMakeLists.txt
+++ b/source/blender/editors/armature/CMakeLists.txt
@@ -11,7 +11,6 @@ set(INC
  ../../depsgraph
  ../../gpu
  ../../makesrna
-  ../../windowmanager
  ../../../../intern/clog
  ../../../../intern/eigen
  # RNA_prototypes.h
@@ -49,6 +48,7 @@ set(LIB
  PRIVATE bf::blenlib
  PRIVATE bf::dna
  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
  ../../../../intern/clog
  # RNA_prototypes.h
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
@@ -53,6 +52,7 @@ set(LIB
  bf_blenloader
  PRIVATE bf::dna
  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
@@ -8,7 +8,6 @@ set(INC
  ../../depsgraph
  ../../gpu
  ../../makesrna
-  ../../windowmanager
  ../../../../intern/clog
  ../../../../extern/curve_fit_nd
  # RNA_prototypes.h
@@ -38,6 +37,7 @@ set(LIB
  PRIVATE bf::blenlib
  PRIVATE bf::dna
  PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
  extern_curve_fit_nd
 )

--- a/source/blender/editors/curves/CMakeLists.txt
+++ b/source/blender/editors/curves/CMakeLists.txt
@@ -10,7 +10,6 @@ set(INC
  ../../geometry
  ../../gpu
  ../../makesrna
-  ../../windowmanager
  ../../../../intern/clog
  ../../bmesh

@@ -33,6 +32,7 @@ set(LIB
  PRIVATE bf::blenlib
  PRIVATE bf::dna
  PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )

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

  # RNA_prototypes.h
@@ -35,7 +34,7 @@ set(LIB
  PRIVATE bf::dna
  bf_editor_object
  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
@@ -9,7 +9,6 @@ set(INC
  ../../depsgraph
  ../../gpu
  ../../makesrna
-  ../../windowmanager
  ../../../../intern/clog
  ../../../../intern/eigen
  # RNA_prototypes.h
@@ -44,6 +43,7 @@ set(LIB
  PRIVATE bf::blenlib
  PRIVATE bf::dna
  PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )


--- a/source/blender/editors/gpencil_legacy/CMakeLists.txt
+++ b/source/blender/editors/gpencil_legacy/CMakeLists.txt
@@ -10,7 +10,6 @@ set(INC
  ../../gpu
  ../../imbuf
  ../../makesrna
-  ../../windowmanager
  ../../bmesh
  # RNA_prototypes.h
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
@@ -60,6 +59,7 @@ set(LIB
  PRIVATE bf::blenlib
  PRIVATE bf::dna
  PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )

 if(WITH_POTRACE)
--- a/source/blender/editors/grease_pencil/CMakeLists.txt
+++ b/source/blender/editors/grease_pencil/CMakeLists.txt
@@ -9,7 +9,6 @@ set(INC
  ../../gpu
  ../../imbuf
  ../../makesrna
-  ../../windowmanager
  # RNA_prototypes.h
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
@@ -31,6 +30,7 @@ set(LIB
  PRIVATE bf::blenlib
  PRIVATE bf::dna
  PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )

 blender_add_lib(bf_editor_grease_pencil "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
--- a/source/blender/editors/interface/CMakeLists.txt
+++ b/source/blender/editors/interface/CMakeLists.txt
@@ -18,7 +18,6 @@ set(INC
  ../../nodes
  ../../python
  ../../render
-  ../../windowmanager
  ../../../../intern/ghost
  ../../../../extern/fmtlib/include
  ../../bmesh
@@ -99,6 +98,7 @@ set(LIB
  PRIVATE bf::dna
  bf_editor_datafiles
  PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )

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

 set(INC_SYS
@@ -52,6 +51,7 @@ set(LIB
  PRIVATE bf::blenlib
  PRIVATE bf::dna
  PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )

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

@@ -29,6 +28,7 @@ set(LIB
  PRIVATE bf::blenlib
  PRIVATE bf::dna
  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
@@ -7,7 +7,6 @@ set(INC
  ../../depsgraph
  ../../gpu
  ../../makesrna
-  ../../windowmanager
 )

 set(INC_SYS
@@ -32,6 +31,7 @@ set(LIB
  PRIVATE bf::blenlib
  PRIVATE bf::dna
  PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )


--- a/source/blender/editors/mesh/CMakeLists.txt
+++ b/source/blender/editors/mesh/CMakeLists.txt
@@ -16,7 +16,6 @@ set(INC
  ../../imbuf
  ../../makesrna
  ../../render
-  ../../windowmanager
  ../../../../intern/clog
  # RNA_prototypes.h
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
@@ -64,7 +63,7 @@ set(LIB
  PRIVATE bf::blenlib
  PRIVATE bf::dna
  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
@@ -8,7 +8,6 @@ set(INC
  ../../gpu
  ../../makesrna
  ../../render
-  ../../windowmanager
  ../../../../intern/clog
 )

@@ -29,6 +28,7 @@ set(LIB
  PRIVATE bf::blenlib
  PRIVATE bf::dna
  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
@@ -18,7 +18,6 @@ set(INC
  ../../python
  ../../render
  ../../shader_fx
-  ../../windowmanager
  ../../../../intern/clog

  # RNA_prototypes.h
@@ -67,7 +66,7 @@ set(LIB
  bf_editor_grease_pencil
  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
@@ -8,7 +8,6 @@ set(INC
  ../../depsgraph
  ../../gpu
  ../../makesrna
-  ../../windowmanager
  ../../../../intern/clog
  ../../../../intern/mantaflow/extern
  # RNA_prototypes.h
@@ -40,6 +39,7 @@ set(LIB
  PRIVATE bf::blenlib
  PRIVATE bf::dna
  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
@@ -15,7 +15,6 @@ set(INC
  ../../nodes
  ../../render
  ../../sequencer
-  ../../windowmanager
  # RNA_prototypes.h
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
@@ -38,6 +37,7 @@ set(LIB
  PRIVATE bf::dna
  bf_draw
  PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )

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

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


--- a/source/blender/editors/screen/CMakeLists.txt
+++ b/source/blender/editors/screen/CMakeLists.txt
@@ -13,7 +13,6 @@ set(INC
  ../../imbuf
  ../../makesrna
  ../../sequencer
-  ../../windowmanager
  # RNA_prototypes.h
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
@@ -47,6 +46,7 @@ set(LIB
  bf_editor_datafiles
  bf_editor_space_sequencer
  PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )


--- a/source/blender/editors/sculpt_paint/CMakeLists.txt
+++ b/source/blender/editors/sculpt_paint/CMakeLists.txt
@@ -16,7 +16,6 @@ set(INC
  ../../makesrna
  ../../nodes
  ../../render
-  ../../windowmanager
  ../../../../intern/clog
  ../../../../intern/eigen
  # RNA_prototypes.h
@@ -98,6 +97,7 @@ set(LIB
  PRIVATE bf::dna
  PRIVATE bf::intern::atomic
  PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )

 if(WITH_TBB)
--- a/source/blender/editors/sound/CMakeLists.txt
+++ b/source/blender/editors/sound/CMakeLists.txt
@@ -7,7 +7,6 @@ set(INC
  ../../depsgraph
  ../../makesrna
  ../../sequencer
-  ../../windowmanager
  # RNA_prototypes.h
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
@@ -27,6 +26,7 @@ set(LIB
  PRIVATE bf::blenlib
  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
@@ -10,7 +10,6 @@ set(INC
  ../../gpu
  ../../makesrna
  ../../modifiers
-  ../../windowmanager

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


--- a/source/blender/editors/space_api/CMakeLists.txt
+++ b/source/blender/editors/space_api/CMakeLists.txt
@@ -8,7 +8,6 @@ set(INC
  ../../asset_system
  ../../gpu
  ../../makesrna
-  ../../windowmanager
 )

 set(INC_SYS
@@ -44,6 +43,7 @@ set(LIB
  bf_editor_space_userpref
  bf_editor_space_view3d
  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
@@ -8,7 +8,6 @@ set(INC
  ../../blentranslation
  ../../gpu
  ../../makesrna
-  ../../windowmanager
  ../../bmesh

  # RNA_prototypes.h
@@ -32,6 +31,7 @@ set(LIB
  PRIVATE bf::blenlib
  PRIVATE bf::dna
  PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )


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

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


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

 )

@@ -28,6 +27,7 @@ set(LIB
  PRIVATE bf::blenlib
  PRIVATE bf::dna
  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
@@ -13,7 +13,6 @@ set(INC
  ../../imbuf
  ../../makesrna
  ../../render
-  ../../windowmanager
  ../../../../extern/fmtlib/include

  # RNA_prototypes.h
@@ -47,6 +46,7 @@ set(LIB
  PRIVATE bf::blenlib
  PRIVATE bf::dna
  PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
  extern_fmtlib
  PRIVATE bf::intern::atomic
 )
--- a/source/blender/editors/space_graph/CMakeLists.txt
+++ b/source/blender/editors/space_graph/CMakeLists.txt
@@ -9,7 +9,6 @@ set(INC
  ../../depsgraph
  ../../gpu
  ../../makesrna
-  ../../windowmanager

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

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

  # RNA_prototypes.h
@@ -42,6 +41,7 @@ set(LIB
  PRIVATE bf::dna
  bf_editor_uvedit
  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
@@ -12,7 +12,6 @@ set(INC
  ../../gpu
  ../../imbuf
  ../../makesrna
-  ../../windowmanager

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


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

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


--- a/source/blender/editors/space_node/CMakeLists.txt
+++ b/source/blender/editors/space_node/CMakeLists.txt
@@ -18,7 +18,6 @@ set(INC
  ../../makesrna
  ../../nodes
  ../../render
-  ../../windowmanager
  ../../../../extern/fmtlib/include

  # RNA_prototypes.h
@@ -55,6 +54,7 @@ set(LIB
  PRIVATE bf::dna
  bf_editor_screen
  PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
  extern_fmtlib
 )

--- a/source/blender/editors/space_outliner/CMakeLists.txt
+++ b/source/blender/editors/space_outliner/CMakeLists.txt
@@ -11,7 +11,6 @@ set(INC
  ../../imbuf
  ../../makesrna
  ../../sequencer
-  ../../windowmanager
  ../../../../intern/clog

  # RNA_prototypes.h
@@ -111,6 +110,7 @@ set(LIB
  PRIVATE bf::dna
  bf_editor_undo
  PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )


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

 )

@@ -28,6 +27,7 @@ set(LIB
  PRIVATE bf::blenlib
  PRIVATE bf::dna
  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
@@ -13,7 +13,6 @@ set(INC
  ../../imbuf
  ../../makesrna
  ../../sequencer
-  ../../windowmanager

  # RNA_prototypes.h
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
@@ -54,6 +53,7 @@ set(LIB
  bf_editor_util
  PRIVATE bf::intern::atomic
  PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )

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

  # RNA_prototypes.h
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
@@ -54,6 +53,7 @@ set(LIB
  PRIVATE bf::blenlib
  PRIVATE bf::dna
  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
@@ -8,7 +8,6 @@ set(INC
  ../../blentranslation
  ../../gpu
  ../../makesrna
-  ../../windowmanager

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


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

 )

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


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

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


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

 )

@@ -26,6 +25,7 @@ set(LIB
  PRIVATE bf::blenlib
  PRIVATE bf::dna
  PRIVATE bf::intern::guardedalloc
+  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
  ../../imbuf
  ../../makesrna
  ../../render
-  ../../windowmanager
  ../../../../intern/mantaflow/extern

  # RNA_prototypes.h
@@ -77,6 +76,7 @@ set(LIB
  bf_editor_lattice
  bf_editor_mesh
  PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )

 if(WITH_PYTHON)
--- a/source/blender/editors/transform/CMakeLists.txt
+++ b/source/blender/editors/transform/CMakeLists.txt
@@ -13,7 +13,6 @@ set(INC
  ../../makesrna
  ../../render
  ../../sequencer
-  ../../windowmanager
  # RNA_prototypes.h
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
@@ -122,6 +121,7 @@ set(LIB
  bf_editor_mask
  bf_gpu
  PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )


--- a/source/blender/editors/undo/CMakeLists.txt
+++ b/source/blender/editors/undo/CMakeLists.txt
@@ -8,7 +8,6 @@ set(INC
  ../../blenloader
  ../../blentranslation
  ../../makesrna
-  ../../windowmanager
  ../../../../intern/clog
  ../../bmesh
 )
@@ -35,6 +34,7 @@ set(LIB
  bf_editor_metaball
  bf_editor_physics
  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
@@ -14,7 +14,6 @@ set(INC
  ../../imbuf
  ../../makesrna
  ../../sequencer
-  ../../windowmanager
  ../../../../intern/clog
  # RNA_prototypes.h
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
@@ -110,6 +109,7 @@ set(LIB
  PRIVATE bf::blenlib
  PRIVATE bf::dna
  PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )


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


--- a/source/blender/gpencil_modifiers_legacy/CMakeLists.txt
+++ b/source/blender/gpencil_modifiers_legacy/CMakeLists.txt
@@ -12,7 +12,6 @@ set(INC
  ../editors/include
  ../makesrna
  ../render
-  ../windowmanager
  ../../../intern/eigen

  # RNA_prototypes.h
@@ -91,6 +90,7 @@ set(LIB
  PRIVATE bf::blenlib
  PRIVATE bf::dna
  PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )

 blender_add_lib(bf_gpencil_modifiers_legacy "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
--- a/source/blender/io/alembic/CMakeLists.txt
+++ b/source/blender/io/alembic/CMakeLists.txt
@@ -11,7 +11,6 @@ set(INC
  ../../depsgraph
  ../../editors/include
  ../../makesrna
-  ../../windowmanager
  ../../../../intern/clog
  ../../../../intern/utfconv
 )
@@ -95,6 +94,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
  ../../editors/include
  ../../imbuf
  ../../makesrna
-  ../../windowmanager
  ../../ikplugin
  ../../../../intern/iksolver/extern
  ../../bmesh
@@ -117,6 +116,7 @@ set(LIB
  PRIVATE bf::blenlib
  PRIVATE bf::dna
  PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )

 if(WITH_BUILDINFO)
--- a/source/blender/io/gpencil/CMakeLists.txt
+++ b/source/blender/io/gpencil/CMakeLists.txt
@@ -11,7 +11,6 @@ set(INC
  ../../editors/include
  ../../makesdna
  ../../makesrna
-  ../../windowmanager
  ../../../../intern/clog
  ../../../../intern/guardedalloc
  ../../../../intern/utfconv 
@@ -40,6 +39,7 @@ set(LIB
  PRIVATE bf::extern::nanosvg
  PRIVATE bf::intern::guardedalloc
  bf_io_common
+  PRIVATE bf::windowmanager
 )

 if(WITH_PUGIXML)
--- a/source/blender/io/ply/CMakeLists.txt
+++ b/source/blender/io/ply/CMakeLists.txt
@@ -12,7 +12,6 @@ set(INC
  ../../depsgraph
  ../../geometry
  ../../makesrna
-  ../../windowmanager
 )

 set(INC_SYS
@@ -56,6 +55,7 @@ set(LIB
  PRIVATE bf::dna
  PRIVATE bf::intern::guardedalloc
  bf_io_common
+  PRIVATE bf::windowmanager
  extern_fmtlib
 )

--- a/source/blender/io/stl/CMakeLists.txt
+++ b/source/blender/io/stl/CMakeLists.txt
@@ -12,7 +12,6 @@ set(INC
  ../../editors/include
  ../../makesrna
  ../../nodes
-  ../../windowmanager
 )

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

 blender_add_lib(bf_stl "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
--- a/source/blender/io/usd/CMakeLists.txt
+++ b/source/blender/io/usd/CMakeLists.txt
@@ -53,7 +53,6 @@ set(INC
  ../../editors/include
  ../../imbuf
  ../../makesrna
-  ../../windowmanager
  ../../../../intern/utfconv
 )

@@ -130,6 +129,7 @@ set(LIB
  bf_imbuf
  PRIVATE bf::intern::guardedalloc
  bf_io_common
+  PRIVATE bf::windowmanager
 )

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

 set(INC_SYS
@@ -59,6 +58,7 @@ set(LIB
  PRIVATE bf::dna
  PRIVATE bf::intern::guardedalloc
  bf_io_common
+  PRIVATE bf::windowmanager
  extern_fmtlib
 )

--- a/source/blender/modifiers/CMakeLists.txt
+++ b/source/blender/modifiers/CMakeLists.txt
@@ -16,7 +16,6 @@ set(INC
  ../makesrna
  ../nodes
  ../render
-  ../windowmanager
  ../../../intern/eigen

  # RNA_prototypes.h
@@ -110,6 +109,7 @@ set(LIB
  PRIVATE bf::blenlib
  PUBLIC bf::dna
  PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )

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

  # RNA_prototypes.h
@@ -90,6 +89,7 @@ set(LIB
  bf_nodes_geometry
  bf_nodes_shader
  bf_nodes_texture
+  PRIVATE bf::windowmanager
  extern_fmtlib
 )

--- a/source/blender/nodes/composite/CMakeLists.txt
+++ b/source/blender/nodes/composite/CMakeLists.txt
@@ -14,7 +14,6 @@ set(INC
  ../../imbuf
  ../../makesrna
  ../../render
-  ../../windowmanager
  ../../compositor/realtime_compositor
  ../../compositor/realtime_compositor/algorithms
  ../../compositor/realtime_compositor/cached_resources
@@ -131,6 +130,7 @@ set(LIB
  PRIVATE bf::dna
  PRIVATE bf::intern::guardedalloc
  bf_realtime_compositor
+  PRIVATE bf::windowmanager
 )

 if(WITH_IMAGE_OPENEXR)
--- 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
@@ -49,6 +48,7 @@ set(LIB
  PRIVATE bf::dna
  bf_functions
  PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )

 blender_add_lib(bf_nodes_function "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
--- a/source/blender/nodes/geometry/CMakeLists.txt
+++ b/source/blender/nodes/geometry/CMakeLists.txt
@@ -16,7 +16,6 @@ set(INC
  ../../imbuf
  ../../makesrna
  ../../render
-  ../../windowmanager
  ../../../../extern/fmtlib/include
  # RNA_prototypes.h
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
@@ -207,6 +206,7 @@ set(LIB
  bf_geometry
  PRIVATE bf::intern::guardedalloc
  bf_nodes
+  PRIVATE bf::windowmanager
  extern_fmtlib
 )

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

 if(WITH_FREESTYLE)
--- a/source/blender/nodes/texture/CMakeLists.txt
+++ b/source/blender/nodes/texture/CMakeLists.txt
@@ -12,7 +12,6 @@ set(INC
  ../../imbuf
  ../../makesrna
  ../../render
-  ../../windowmanager
  ../../bmesh
  # RNA_prototypes.h
  ${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
@@ -12,7 +12,6 @@ set(INC
  ../../imbuf
  ../../imbuf/intern/oiio
  ../../makesrna
-  ../../windowmanager
  ../../../../intern/clog
  ../../../../intern/mantaflow/extern
  ../../../../intern/opencolorio
@@ -130,6 +129,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
 )
@@ -63,6 +62,7 @@ set(LIB
  PRIVATE bf::intern::guardedalloc
  bf_realtime_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
  ../makesrna
  ../render
-  ../windowmanager
  ../../../intern/clog

  # RNA_prototypes.h
@@ -87,6 +86,7 @@ set(LIB
  PRIVATE bf::dna
  PRIVATE bf::intern::atomic
  PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::windowmanager
 )

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


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

 set(INC
-  .
-  gizmo
-  gizmo/intern
+  PUBLIC .
+  PUBLIC gizmo
+  PRIVATE gizmo/intern
  ../asset_system
  ../blenfont
  ../blenloader
@@ -205,6 +205,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.h
 add_dependencies(bf_windowmanager bf_rna)
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -12,7 +12,6 @@ set(INC
  ../blender/bmesh
  ../blender/makesrna
  ../blender/render
-  ../blender/windowmanager
 )

 set(LIB
@@ -20,7 +19,7 @@ set(LIB
  PRIVATE bf::blenlib
  PRIVATE bf::dna
  PRIVATE bf::intern::guardedalloc
-  bf_windowmanager
+  PRIVATE bf::windowmanager
 )

 if(HAVE_FEENABLEEXCEPT)