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
2023-07-21 19:13:37 +02:00
parent 0f541db97c
commit a670b53abe
27 changed files with 28 additions and 29 deletions
--- 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)
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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