Cleanup: CMake: Modernize bf_functions dependencies

Pretty straightforward - Remove any bf_functions 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/132335
2024-12-25 19:46:31 +01:00
parent a23aab3ddc
commit 4dcef4421c
24 changed files with 25 additions and 31 deletions
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -6,7 +6,6 @@ set(INC
  PUBLIC .
  ../asset_system
  ../draw
-  ../functions
  ../ikplugin
  ../imbuf
  ../makesrna
@@ -564,7 +563,7 @@ set(LIB
  PRIVATE bf::dna
  bf_draw
  PRIVATE bf::extern::curve_fit_nd
-  bf_functions
+  PRIVATE bf::functions
  PRIVATE bf::gpu
  bf_ikplugin
  bf_imbuf
--- a/source/blender/compositor/CMakeLists.txt
+++ b/source/blender/compositor/CMakeLists.txt
@@ -7,7 +7,6 @@ set(INC
  algorithms
  cached_resources
  utilities
-  ../functions
  ../gpu/intern
  ../imbuf
  ../makesrna
@@ -147,7 +146,7 @@ set(SRC
 set(LIB
  PRIVATE bf::blenkernel
  PRIVATE bf::blentranslation
-  bf_functions
+  PRIVATE bf::functions
  PRIVATE bf::gpu
  bf_imbuf
  bf_render
--- a/source/blender/depsgraph/CMakeLists.txt
+++ b/source/blender/depsgraph/CMakeLists.txt
@@ -6,7 +6,6 @@ set(INC
  PUBLIC .
  ../animrig
  ../draw
-  ../functions
  ../makesrna
  ../modifiers
  ../sequencer
@@ -153,6 +152,7 @@ set(LIB
  PRIVATE bf::blenlib
  PRIVATE bf::bmesh
  PRIVATE bf::dna
+  PRIVATE bf::functions
  PRIVATE bf::intern::atomic
  PRIVATE bf::intern::guardedalloc
  PRIVATE bf::windowmanager
--- a/source/blender/draw/CMakeLists.txt
+++ b/source/blender/draw/CMakeLists.txt
@@ -8,7 +8,6 @@ set(INC

  ../editors/include
  ../editors/space_view3d
-  ../functions
  ../gpu/intern
  ../imbuf
  ../makesrna
@@ -306,6 +305,7 @@ set(LIB
  PRIVATE bf::bmesh
  PRIVATE bf::depsgraph
  PRIVATE bf::dna
+  PRIVATE bf::functions
  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
@@ -4,7 +4,6 @@

 set(INC
  ../include
-  ../../functions
  ../../geometry
  ../../makesrna

@@ -38,6 +37,7 @@ set(LIB
  PRIVATE bf::dna
  PRIVATE bf::extern::curve_fit_nd
  PRIVATE bf::extern::fmtlib
+  PRIVATE bf::functions
  PRIVATE bf::gpu
  PRIVATE bf::intern::clog
  PRIVATE bf::intern::guardedalloc
--- a/source/blender/editors/geometry/CMakeLists.txt
+++ b/source/blender/editors/geometry/CMakeLists.txt
@@ -5,7 +5,6 @@
 set(INC
  ../include
  ../../asset_system
-  ../../functions
  ../../makesrna
  ../../nodes

@@ -34,6 +33,7 @@ set(LIB
  PRIVATE bf::dna
  bf_editor_object
  PRIVATE bf::extern::fmtlib
+  PRIVATE bf::functions
  PRIVATE bf::intern::guardedalloc
  PRIVATE bf::windowmanager
 )
--- a/source/blender/editors/grease_pencil/CMakeLists.txt
+++ b/source/blender/editors/grease_pencil/CMakeLists.txt
@@ -10,7 +10,6 @@ set(INC
  ../../geometry
  ../sculpt_paint
  ../../modifiers/intern/lineart
-  ../../functions
  # RNA_prototypes.hh
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
@@ -49,6 +48,7 @@ set(LIB
  PRIVATE bf::bmesh
  PRIVATE bf::depsgraph
  PRIVATE bf::dna
+  PRIVATE bf::functions
  PRIVATE bf::gpu
  PRIVATE bf::intern::guardedalloc
  PRIVATE bf::intern::clog
--- a/source/blender/editors/interface/CMakeLists.txt
+++ b/source/blender/editors/interface/CMakeLists.txt
@@ -8,7 +8,6 @@ set(INC
  ../include
  ../../asset_system
  ../../draw
-  ../../functions
  ../../imbuf
  ../../imbuf/movie
  ../../makesrna
@@ -106,6 +105,7 @@ set(LIB
  bf_editor_datafiles
  bf_editor_id_management
  PRIVATE bf::extern::fmtlib
+  PRIVATE bf::functions
  PRIVATE bf::gpu
  PRIVATE bf::intern::guardedalloc
  PRIVATE bf::animrig
--- a/source/blender/editors/mesh/CMakeLists.txt
+++ b/source/blender/editors/mesh/CMakeLists.txt
@@ -6,7 +6,6 @@ set(INC
  ../include
  ../uvedit
  ../../draw
-  ../../functions
  ../../geometry
  ../../imbuf
  ../../makesrna
@@ -65,6 +64,7 @@ set(LIB
  PRIVATE bf::depsgraph
  PRIVATE bf::dna
  PRIVATE bf::extern::fmtlib
+  PRIVATE bf::functions
  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
@@ -5,7 +5,6 @@
 set(INC
  ../include
  ../../asset_system
-  ../../functions
  ../../geometry
  ../../ikplugin
  ../../imbuf
@@ -67,6 +66,7 @@ set(LIB
  bf_editor_metaball
  bf_editor_grease_pencil
  PRIVATE bf::extern::fmtlib
+  PRIVATE bf::functions
  PRIVATE bf::gpu
  PRIVATE bf::intern::clog
  PRIVATE bf::intern::guardedalloc
--- a/source/blender/editors/sculpt_paint/CMakeLists.txt
+++ b/source/blender/editors/sculpt_paint/CMakeLists.txt
@@ -11,7 +11,6 @@ set(INC
  ../../asset_system
  ../../blenlib
  ../../draw
-  ../../functions
  ../../geometry
  ../../imbuf
  ../../makesrna
@@ -183,6 +182,7 @@ set(LIB
  PRIVATE bf::depsgraph
  PRIVATE bf::dna
  PRIVATE bf::extern::fmtlib
+  PRIVATE bf::functions
  PRIVATE bf::gpu
  PRIVATE bf::intern::atomic
  PRIVATE bf::intern::clog
--- a/source/blender/editors/space_node/CMakeLists.txt
+++ b/source/blender/editors/space_node/CMakeLists.txt
@@ -8,7 +8,6 @@ set(INC
  ../../asset_system
  ../../compositor
  ../../draw
-  ../../functions
  ../../geometry
  ../../imbuf
  ../../makesrna
@@ -55,6 +54,7 @@ set(LIB
  PRIVATE bf::depsgraph
  PRIVATE bf::dna
  bf_editor_screen
+  PRIVATE bf::functions
  PRIVATE bf::gpu
  PRIVATE bf::intern::guardedalloc
  bf_compositor
--- a/source/blender/editors/space_spreadsheet/CMakeLists.txt
+++ b/source/blender/editors/space_spreadsheet/CMakeLists.txt
@@ -4,7 +4,6 @@

 set(INC
  ../include
-  ../../functions
  ../../makesrna
  ../../nodes

@@ -52,6 +51,7 @@ set(LIB
  PRIVATE bf::depsgraph
  PRIVATE bf::dna
  PRIVATE bf::extern::fmtlib
+  PRIVATE bf::functions
  PRIVATE bf::gpu
  PRIVATE bf::intern::guardedalloc
  PRIVATE bf::windowmanager
--- a/source/blender/editors/space_view3d/CMakeLists.txt
+++ b/source/blender/editors/space_view3d/CMakeLists.txt
@@ -7,7 +7,6 @@ set(INC
  ../include
  ../../asset_system
  ../../draw
-  ../../functions
  ../../imbuf
  ../../makesrna
  ../../modifiers
@@ -88,6 +87,7 @@ set(LIB
  bf_editor_curves
  bf_editor_lattice
  bf_editor_mesh
+  PRIVATE bf::functions
  PRIVATE bf::gpu
  PRIVATE bf::intern::guardedalloc
  PRIVATE bf::windowmanager
--- a/source/blender/functions/CMakeLists.txt
+++ b/source/blender/functions/CMakeLists.txt
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: GPL-2.0-or-later

 set(INC
-  .
+  PUBLIC .
 )

 set(INC_SYS
@@ -56,6 +56,7 @@ if(WITH_TBB)
 endif()

 blender_add_lib(bf_functions "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
+add_library(bf::functions ALIAS bf_functions)

 if(WITH_GTESTS)
  set(TEST_INC
--- a/source/blender/geometry/CMakeLists.txt
+++ b/source/blender/geometry/CMakeLists.txt
@@ -4,7 +4,6 @@

 set(INC
  .
-  ../functions
  ../makesrna
  ../../../intern/eigen
 )
@@ -102,6 +101,7 @@ set(LIB
  PRIVATE bf::blentranslation
  PRIVATE bf::bmesh
  PRIVATE bf::dna
+  PRIVATE bf::functions
  PRIVATE bf::intern::atomic
  PRIVATE bf::intern::guardedalloc
  PRIVATE bf::extern::fmtlib
--- a/source/blender/io/grease_pencil/CMakeLists.txt
+++ b/source/blender/io/grease_pencil/CMakeLists.txt
@@ -6,7 +6,6 @@ set(INC
  .
  ../common
  ../../editors/include
-  ../../functions
  ../../geometry
  ../../makesdna
  ../../makesrna
@@ -34,6 +33,7 @@ set(LIB
  PRIVATE bf::depsgraph
  PRIVATE bf::dna
  PRIVATE bf::extern::nanosvg
+  PRIVATE bf::functions
  PRIVATE bf::intern::clog
  PRIVATE bf::intern::guardedalloc
  PRIVATE bf::windowmanager
--- a/source/blender/modifiers/CMakeLists.txt
+++ b/source/blender/modifiers/CMakeLists.txt
@@ -7,7 +7,6 @@ set(INC
  intern
  intern/lineart
  ../editors/include
-  ../functions
  ../geometry
  ../makesrna
  ../nodes
@@ -143,6 +142,7 @@ set(LIB
  PRIVATE bf::bmesh
  PRIVATE bf::depsgraph
  PUBLIC bf::dna
+  PRIVATE bf::functions
  PRIVATE bf::intern::guardedalloc
  PRIVATE bf::extern::fmtlib
  PRIVATE bf::windowmanager
--- a/source/blender/nodes/CMakeLists.txt
+++ b/source/blender/nodes/CMakeLists.txt
@@ -56,7 +56,6 @@ set(INC
  ../animrig
  ../editors/include
  ../depsgraph
-  ../functions
  ../geometry
  ../imbuf
  ../makesrna
@@ -142,7 +141,7 @@ set(LIB
  PRIVATE bf::bmesh
  PRIVATE bf::depsgraph
  PRIVATE bf::dna
-  bf_functions
+  PRIVATE bf::functions
  PRIVATE bf::gpu
  PRIVATE bf::intern::guardedalloc
  bf_nodes_composite
--- a/source/blender/nodes/composite/CMakeLists.txt
+++ b/source/blender/nodes/composite/CMakeLists.txt
@@ -7,7 +7,6 @@ set(INC
  ..
  ../intern
  ../../editors/include
-  ../../functions
  ../../imbuf
  ../../makesrna
  ../../render
@@ -128,7 +127,7 @@ set(LIB
  PRIVATE bf::blentranslation
  PRIVATE bf::depsgraph
  PRIVATE bf::dna
-  bf_functions
+  PRIVATE bf::functions
  PRIVATE bf::gpu
  PRIVATE bf::intern::guardedalloc
  PRIVATE bf::extern::fmtlib
--- a/source/blender/nodes/function/CMakeLists.txt
+++ b/source/blender/nodes/function/CMakeLists.txt
@@ -7,7 +7,6 @@ set(INC
  ..
  ../intern
  ../../editors/include
-  ../../functions
  ../../makesrna
 )

@@ -70,7 +69,7 @@ set(LIB
  PRIVATE bf::blenlib
  PRIVATE bf::blentranslation
  PRIVATE bf::dna
-  bf_functions
+  PRIVATE bf::functions
  PRIVATE bf::intern::guardedalloc
  PRIVATE bf::windowmanager
 )
--- a/source/blender/nodes/geometry/CMakeLists.txt
+++ b/source/blender/nodes/geometry/CMakeLists.txt
@@ -8,7 +8,6 @@ set(INC
  include
  ../intern
  ../../editors/include
-  ../../functions
  ../../geometry
  ../../imbuf
  ../../imbuf/movie
@@ -249,7 +248,7 @@ set(LIB
  PRIVATE bf::bmesh
  PRIVATE bf::depsgraph
  PRIVATE bf::dna
-  bf_functions
+  PRIVATE bf::functions
  bf_geometry
  PRIVATE bf::gpu
  PRIVATE bf::intern::guardedalloc
--- a/source/blender/nodes/shader/CMakeLists.txt
+++ b/source/blender/nodes/shader/CMakeLists.txt
@@ -7,7 +7,6 @@ set(INC
  ..
  ../intern
  ../../editors/include
-  ../../functions
  ../../imbuf
  ../../makesrna
  ../../render
@@ -130,7 +129,7 @@ set(LIB
  PRIVATE bf::blentranslation
  PRIVATE bf::depsgraph
  PRIVATE bf::dna
-  bf_functions
+  PRIVATE bf::functions
  PRIVATE bf::gpu
  PRIVATE bf::intern::clog
  PRIVATE bf::intern::guardedalloc
--- a/source/blender/simulation/CMakeLists.txt
+++ b/source/blender/simulation/CMakeLists.txt
@@ -5,7 +5,6 @@
 set(INC
  .
  intern
-  ../functions
  ../imbuf
  ../makesrna
  ../nodes
@@ -33,6 +32,7 @@ set(LIB
  PRIVATE bf::blenlib
  PRIVATE bf::depsgraph
  PRIVATE bf::dna
+  PRIVATE bf::functions
  PRIVATE bf::intern::guardedalloc
 )