From a670b53abe82f7a36d2caa0d8ae2c67c2bc8c39a Mon Sep 17 00:00:00 2001
From: Ray Molenkamp <github@lazydodo.com>
Date: Fri, 21 Jul 2023 19:13:37 +0200
Subject: [PATCH] Cleanup: CMake: Modernize bf_blenfont dependencies

Pretty straightforward

- Remove any blenfont 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/110351
---
 source/blender/blenfont/CMakeLists.txt                  | 3 ++-
 source/blender/blenkernel/CMakeLists.txt                | 3 +--
 source/blender/blenloader/CMakeLists.txt                | 2 +-
 source/blender/draw/CMakeLists.txt                      | 2 +-
 source/blender/editors/armature/CMakeLists.txt          | 2 +-
 source/blender/editors/gpencil_legacy/CMakeLists.txt    | 2 +-
 source/blender/editors/interface/CMakeLists.txt         | 2 +-
 source/blender/editors/mesh/CMakeLists.txt              | 2 +-
 source/blender/editors/object/CMakeLists.txt            | 2 +-
 source/blender/editors/screen/CMakeLists.txt            | 2 +-
 source/blender/editors/space_clip/CMakeLists.txt        | 2 +-
 source/blender/editors/space_console/CMakeLists.txt     | 2 +-
 source/blender/editors/space_file/CMakeLists.txt        | 2 +-
 source/blender/editors/space_image/CMakeLists.txt       | 2 +-
 source/blender/editors/space_info/CMakeLists.txt        | 2 +-
 source/blender/editors/space_node/CMakeLists.txt        | 2 +-
 source/blender/editors/space_sequencer/CMakeLists.txt   | 2 +-
 source/blender/editors/space_spreadsheet/CMakeLists.txt | 2 +-
 source/blender/editors/space_text/CMakeLists.txt        | 2 +-
 source/blender/editors/space_view3d/CMakeLists.txt      | 2 +-
 source/blender/editors/transform/CMakeLists.txt         | 3 +--
 source/blender/editors/util/CMakeLists.txt              | 2 +-
 source/blender/gpencil_modifiers_legacy/CMakeLists.txt  | 2 +-
 source/blender/modifiers/CMakeLists.txt                 | 2 +-
 source/blender/sequencer/CMakeLists.txt                 | 2 +-
 source/blender/shader_fx/CMakeLists.txt                 | 2 +-
 source/blender/windowmanager/CMakeLists.txt             | 2 +-
 27 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/source/blender/blenfont/CMakeLists.txt b/source/blender/blenfont/CMakeLists.txt
index 89e3523de2e..1a92ecf4d99 100644
--- a/source/blender/blenfont/CMakeLists.txt
+++ b/source/blender/blenfont/CMakeLists.txt
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
 set(INC
-  .
+  PUBLIC .
   ../gpu
   ../imbuf
   ../makesrna
@@ -54,3 +54,4 @@ endif()
 
 
 blender_add_lib(bf_blenfont "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
+add_library(bf::blenfont ALIAS bf_blenfont)
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index a53ead02fe2..3fd5d3efd8e 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -5,7 +5,6 @@
 set(INC
   PUBLIC .
   ../asset_system
-  ../blenfont
   ../blenloader
   ../bmesh
   ../draw
@@ -523,7 +522,7 @@ set(SRC
 
 set(LIB
   bf_asset_system
-  bf_blenfont
+  PRIVATE bf::blenfont
   PRIVATE bf::blenlib
   bf_blenloader
   PRIVATE bf::blentranslation
diff --git a/source/blender/blenloader/CMakeLists.txt b/source/blender/blenloader/CMakeLists.txt
index c007cc293aa..3d757be003c 100644
--- a/source/blender/blenloader/CMakeLists.txt
+++ b/source/blender/blenloader/CMakeLists.txt
@@ -4,7 +4,6 @@
 
 set(INC
   .
-  ../blenfont
   ../draw
   ../editors/include
   ../gpu
@@ -55,6 +54,7 @@ set(SRC
 )
 
 set(LIB
+  PRIVATE bf::blenfont
   PRIVATE bf::blenkernel
   PRIVATE bf::blenlib
   PRIVATE bf::blentranslation
diff --git a/source/blender/draw/CMakeLists.txt b/source/blender/draw/CMakeLists.txt
index 90299a2ea27..23ad199809c 100644
--- a/source/blender/draw/CMakeLists.txt
+++ b/source/blender/draw/CMakeLists.txt
@@ -6,7 +6,6 @@ set(INC
   .
   intern
 
-  ../blenfont
   ../blenloader
   ../bmesh
   ../editors/include
@@ -347,6 +346,7 @@ set(SRC
 )
 
 set(LIB
+  PRIVATE bf::blenfont
   PRIVATE bf::blenkernel
   PRIVATE bf::blenlib
   PRIVATE bf::blentranslation
diff --git a/source/blender/editors/armature/CMakeLists.txt b/source/blender/editors/armature/CMakeLists.txt
index 3aa42b774fd..3064de14c1f 100644
--- a/source/blender/editors/armature/CMakeLists.txt
+++ b/source/blender/editors/armature/CMakeLists.txt
@@ -5,7 +5,6 @@
 set(INC
   ../include
   ../../asset_system
-  ../../blenfont
   ../../blenloader
   ../../gpu
   ../../makesrna
@@ -41,6 +40,7 @@ set(SRC
 )
 
 set(LIB
+  PRIVATE bf::blenfont
   PRIVATE bf::blenkernel
   PRIVATE bf::blenlib
   PRIVATE bf::blentranslation
diff --git a/source/blender/editors/gpencil_legacy/CMakeLists.txt b/source/blender/editors/gpencil_legacy/CMakeLists.txt
index 7e471d282e5..9af19bc50c5 100644
--- a/source/blender/editors/gpencil_legacy/CMakeLists.txt
+++ b/source/blender/editors/gpencil_legacy/CMakeLists.txt
@@ -4,7 +4,6 @@
 
 set(INC
   ../include
-  ../../blenfont
   ../../gpu
   ../../imbuf
   ../../makesrna
@@ -53,6 +52,7 @@ set(SRC
 )
 
 set(LIB
+  PRIVATE bf::blenfont
   PRIVATE bf::blenkernel
   PRIVATE bf::blenlib
   PRIVATE bf::blentranslation
diff --git a/source/blender/editors/interface/CMakeLists.txt b/source/blender/editors/interface/CMakeLists.txt
index 59fc6529ec1..1d46377da0a 100644
--- a/source/blender/editors/interface/CMakeLists.txt
+++ b/source/blender/editors/interface/CMakeLists.txt
@@ -6,7 +6,6 @@ set(INC
   .
   ../include
   ../../asset_system
-  ../../blenfont
   ../../blenloader
   ../../draw
   ../../functions
@@ -91,6 +90,7 @@ set(SRC
 )
 
 set(LIB
+  PRIVATE bf::blenfont
   PRIVATE bf::blenkernel
   PRIVATE bf::blenlib
   PRIVATE bf::blentranslation
diff --git a/source/blender/editors/mesh/CMakeLists.txt b/source/blender/editors/mesh/CMakeLists.txt
index 96e2721ff75..5f76d1bb4e6 100644
--- a/source/blender/editors/mesh/CMakeLists.txt
+++ b/source/blender/editors/mesh/CMakeLists.txt
@@ -5,7 +5,6 @@
 set(INC
   ../include
   ../uvedit
-  ../../blenfont
   ../../bmesh
   ../../draw
   ../../functions
@@ -56,6 +55,7 @@ set(SRC
 )
 
 set(LIB
+  PRIVATE bf::blenfont
   PRIVATE bf::blenkernel
   PRIVATE bf::blenlib
   PRIVATE bf::blentranslation
diff --git a/source/blender/editors/object/CMakeLists.txt b/source/blender/editors/object/CMakeLists.txt
index 4e0e067a100..0a50cb8adbe 100644
--- a/source/blender/editors/object/CMakeLists.txt
+++ b/source/blender/editors/object/CMakeLists.txt
@@ -4,7 +4,6 @@
 
 set(INC
   ../include
-  ../../blenfont
   ../../bmesh
   ../../functions
   ../../gpencil_modifiers_legacy
@@ -56,6 +55,7 @@ set(SRC
 )
 
 set(LIB
+  PRIVATE bf::blenfont
   PRIVATE bf::blenkernel
   PRIVATE bf::blenlib
   PRIVATE bf::blentranslation
diff --git a/source/blender/editors/screen/CMakeLists.txt b/source/blender/editors/screen/CMakeLists.txt
index f9179494908..3cb34e1bfe9 100644
--- a/source/blender/editors/screen/CMakeLists.txt
+++ b/source/blender/editors/screen/CMakeLists.txt
@@ -4,7 +4,6 @@
 
 set(INC
   ../include
-  ../../blenfont
   ../../blenloader
   ../../bmesh
   ../../gpu
@@ -38,6 +37,7 @@ set(SRC
 )
 
 set(LIB
+  PRIVATE bf::blenfont
   PRIVATE bf::blenkernel
   PRIVATE bf::blenlib
   PRIVATE bf::blentranslation
diff --git a/source/blender/editors/space_clip/CMakeLists.txt b/source/blender/editors/space_clip/CMakeLists.txt
index 03fcd89a040..c6de7cab062 100644
--- a/source/blender/editors/space_clip/CMakeLists.txt
+++ b/source/blender/editors/space_clip/CMakeLists.txt
@@ -4,7 +4,6 @@
 
 set(INC
   ../include
-  ../../blenfont
   ../../blenloader
   ../../gpu
   ../../imbuf
@@ -43,6 +42,7 @@ set(SRC
 )
 
 set(LIB
+  PRIVATE bf::blenfont
   PRIVATE bf::blenkernel
   PRIVATE bf::blenlib
   PRIVATE bf::blentranslation
diff --git a/source/blender/editors/space_console/CMakeLists.txt b/source/blender/editors/space_console/CMakeLists.txt
index a48cd986f5c..f268d2041bf 100644
--- a/source/blender/editors/space_console/CMakeLists.txt
+++ b/source/blender/editors/space_console/CMakeLists.txt
@@ -4,7 +4,6 @@
 
 set(INC
   ../include
-  ../../blenfont
   ../../blenloader
   ../../gpu
   ../../makesrna
@@ -23,6 +22,7 @@ set(SRC
 )
 
 set(LIB
+  PRIVATE bf::blenfont
   PRIVATE bf::blenkernel
   PRIVATE bf::blenlib
   PRIVATE bf::dna
diff --git a/source/blender/editors/space_file/CMakeLists.txt b/source/blender/editors/space_file/CMakeLists.txt
index 2ac7c097ce8..c899a234bcf 100644
--- 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
-  ../../blenfont
   ../../blenloader
   ../../gpu
   ../../imbuf
@@ -41,6 +40,7 @@ set(SRC
 )
 
 set(LIB
+  PRIVATE bf::blenfont
   PRIVATE bf::blenkernel
   PRIVATE bf::blenlib
   PRIVATE bf::blentranslation
diff --git a/source/blender/editors/space_image/CMakeLists.txt b/source/blender/editors/space_image/CMakeLists.txt
index 824f0fb207c..8ac5c362149 100644
--- a/source/blender/editors/space_image/CMakeLists.txt
+++ b/source/blender/editors/space_image/CMakeLists.txt
@@ -4,7 +4,6 @@
 
 set(INC
   ../include
-  ../../blenfont
   ../../blenloader
   ../../bmesh
   ../../draw
@@ -33,6 +32,7 @@ set(SRC
 )
 
 set(LIB
+  PRIVATE bf::blenfont
   PRIVATE bf::blenkernel
   PRIVATE bf::blenlib
   PRIVATE bf::blentranslation
diff --git a/source/blender/editors/space_info/CMakeLists.txt b/source/blender/editors/space_info/CMakeLists.txt
index ce6d3d3a538..6f5a9856c99 100644
--- a/source/blender/editors/space_info/CMakeLists.txt
+++ b/source/blender/editors/space_info/CMakeLists.txt
@@ -4,7 +4,6 @@
 
 set(INC
   ../include
-  ../../blenfont
   ../../blenloader
   ../../bmesh
   ../../gpu
@@ -31,6 +30,7 @@ set(SRC
 )
 
 set(LIB
+  PRIVATE bf::blenfont
   PRIVATE bf::blenkernel
   PRIVATE bf::blenlib
   PRIVATE bf::blentranslation
diff --git a/source/blender/editors/space_node/CMakeLists.txt b/source/blender/editors/space_node/CMakeLists.txt
index 8ec34e572f2..0d0eb9c1e50 100644
--- a/source/blender/editors/space_node/CMakeLists.txt
+++ b/source/blender/editors/space_node/CMakeLists.txt
@@ -5,7 +5,6 @@
 set(INC
   ../include
   ../../asset_system
-  ../../blenfont
   ../../blenloader
   ../../compositor
   ../../draw
@@ -47,6 +46,7 @@ set(SRC
 )
 
 set(LIB
+  PRIVATE bf::blenfont
   PRIVATE bf::blenkernel
   PRIVATE bf::blenlib
   PRIVATE bf::blentranslation
diff --git a/source/blender/editors/space_sequencer/CMakeLists.txt b/source/blender/editors/space_sequencer/CMakeLists.txt
index 547afcb72ba..280b8d24d47 100644
--- a/source/blender/editors/space_sequencer/CMakeLists.txt
+++ b/source/blender/editors/space_sequencer/CMakeLists.txt
@@ -4,7 +4,6 @@
 
 set(INC
   ../include
-  ../../blenfont
   ../../blenloader
   ../../draw
   ../../gpu
@@ -44,6 +43,7 @@ set(SRC
 )
 
 set(LIB
+  PRIVATE bf::blenfont
   PRIVATE bf::blenkernel
   PRIVATE bf::blenlib
   PRIVATE bf::blentranslation
diff --git a/source/blender/editors/space_spreadsheet/CMakeLists.txt b/source/blender/editors/space_spreadsheet/CMakeLists.txt
index 7577bf9bc43..065b6ba6fbb 100644
--- a/source/blender/editors/space_spreadsheet/CMakeLists.txt
+++ b/source/blender/editors/space_spreadsheet/CMakeLists.txt
@@ -4,7 +4,6 @@
 
 set(INC
   ../include
-  ../../blenfont
   ../../blenloader
   ../../bmesh
   ../../functions
@@ -47,6 +46,7 @@ set(SRC
 )
 
 set(LIB
+  PRIVATE bf::blenfont
   PRIVATE bf::blenkernel
   PRIVATE bf::blenlib
   PRIVATE bf::blentranslation
diff --git a/source/blender/editors/space_text/CMakeLists.txt b/source/blender/editors/space_text/CMakeLists.txt
index a41c97c5f66..2c03cabd841 100644
--- a/source/blender/editors/space_text/CMakeLists.txt
+++ b/source/blender/editors/space_text/CMakeLists.txt
@@ -4,7 +4,6 @@
 
 set(INC
   ../include
-  ../../blenfont
   ../../blenloader
   ../../gpu
   ../../makesrna
@@ -32,6 +31,7 @@ set(SRC
 )
 
 set(LIB
+  PRIVATE bf::blenfont
   PRIVATE bf::blenkernel
   PRIVATE bf::blenlib
   PRIVATE bf::blentranslation
diff --git a/source/blender/editors/space_view3d/CMakeLists.txt b/source/blender/editors/space_view3d/CMakeLists.txt
index 035769b13f1..5c276b8e8a6 100644
--- a/source/blender/editors/space_view3d/CMakeLists.txt
+++ b/source/blender/editors/space_view3d/CMakeLists.txt
@@ -5,7 +5,6 @@
 set(INC
   ../include
   ../../asset_system
-  ../../blenfont
   ../../blenloader
   ../../bmesh
   ../../draw
@@ -67,6 +66,7 @@ set(SRC
 )
 
 set(LIB
+  PRIVATE bf::blenfont
   PRIVATE bf::blenkernel
   PRIVATE bf::blenlib
   PRIVATE bf::blentranslation
diff --git a/source/blender/editors/transform/CMakeLists.txt b/source/blender/editors/transform/CMakeLists.txt
index c79755403eb..d1ca62d4229 100644
--- a/source/blender/editors/transform/CMakeLists.txt
+++ b/source/blender/editors/transform/CMakeLists.txt
@@ -4,7 +4,6 @@
 
 set(INC
   ../include
-  ../../blenfont
   ../../bmesh
   ../../gpu
   ../../ikplugin
@@ -111,7 +110,7 @@ set(SRC
 )
 
 set(LIB
-  bf_blenfont
+  PRIVATE bf::blenfont
   PRIVATE bf::blenkernel
   PRIVATE bf::blenlib
   PRIVATE bf::blentranslation
diff --git a/source/blender/editors/util/CMakeLists.txt b/source/blender/editors/util/CMakeLists.txt
index 842b2973ebf..04921345fd1 100644
--- 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
-  ../../blenfont
   ../../bmesh
   ../../gpu
   ../../imbuf
@@ -102,6 +101,7 @@ set(SRC
 )
 
 set(LIB
+  PRIVATE bf::blenfont
   PRIVATE bf::blenkernel
   PRIVATE bf::blenlib
   PRIVATE bf::blentranslation
diff --git a/source/blender/gpencil_modifiers_legacy/CMakeLists.txt b/source/blender/gpencil_modifiers_legacy/CMakeLists.txt
index 4d90e827cbb..5dc6f48f7be 100644
--- a/source/blender/gpencil_modifiers_legacy/CMakeLists.txt
+++ b/source/blender/gpencil_modifiers_legacy/CMakeLists.txt
@@ -5,7 +5,6 @@
 set(INC
   .
   intern
-  ../blenfont
   ../bmesh
   ../editors/include
   ../makesrna
@@ -84,6 +83,7 @@ list(APPEND LIB
 endif()
 
 set(LIB
+  PRIVATE bf::blenfont
   PRIVATE bf::blenkernel
   PRIVATE bf::blenlib
   PRIVATE bf::blentranslation
diff --git a/source/blender/modifiers/CMakeLists.txt b/source/blender/modifiers/CMakeLists.txt
index 4941e97beb8..9bb21e4b83d 100644
--- a/source/blender/modifiers/CMakeLists.txt
+++ b/source/blender/modifiers/CMakeLists.txt
@@ -5,7 +5,6 @@
 set(INC
   .
   intern
-  ../blenfont
   ../blenloader
   ../bmesh
   ../editors/include
@@ -103,6 +102,7 @@ set(SRC
 )
 
 set(LIB
+  PRIVATE bf::blenfont
   PRIVATE bf::blenkernel
   PRIVATE bf::blenlib
   PRIVATE bf::blentranslation
diff --git a/source/blender/sequencer/CMakeLists.txt b/source/blender/sequencer/CMakeLists.txt
index 226125e6277..c93ee1f3fe9 100644
--- a/source/blender/sequencer/CMakeLists.txt
+++ b/source/blender/sequencer/CMakeLists.txt
@@ -5,7 +5,6 @@
 set(INC
   .
   intern
-  ../blenfont
   ../blenloader
   ../imbuf
   ../makesrna
@@ -78,6 +77,7 @@ set(SRC
 )
 
 set(LIB
+  PRIVATE bf::blenfont
   PRIVATE bf::blenkernel
   PRIVATE bf::blenlib
   PRIVATE bf::blentranslation
diff --git a/source/blender/shader_fx/CMakeLists.txt b/source/blender/shader_fx/CMakeLists.txt
index 19299f5cd09..d3b149f2e21 100644
--- a/source/blender/shader_fx/CMakeLists.txt
+++ b/source/blender/shader_fx/CMakeLists.txt
@@ -5,7 +5,6 @@
 set(INC
   .
   intern
-  ../blenfont
   ../bmesh
   ../editors/include
   ../makesrna
@@ -39,6 +38,7 @@ set(SRC
 )
 
 set(LIB
+  PRIVATE bf::blenfont
   PRIVATE bf::blenkernel
   PRIVATE bf::blenlib
   PRIVATE bf::blentranslation
diff --git a/source/blender/windowmanager/CMakeLists.txt b/source/blender/windowmanager/CMakeLists.txt
index d1b24929748..2ecfdf2da09 100644
--- a/source/blender/windowmanager/CMakeLists.txt
+++ b/source/blender/windowmanager/CMakeLists.txt
@@ -7,7 +7,6 @@ set(INC
   PUBLIC gizmo
   PRIVATE gizmo/intern
   ../asset_system
-  ../blenfont
   ../blenloader
   ../compositor
   ../editors/include
@@ -93,6 +92,7 @@ set(SRC
 )
 
 set(LIB
+  PRIVATE bf::blenfont
   PRIVATE bf::blenkernel
   PRIVATE bf::blenlib
   PRIVATE bf::blentranslation