griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: CMake: Modernize bf_functions dependencies

Browse Source 
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/115427
This commit is contained in:
Ray molenkamp
2023-11-28 01:14:15 +01:00
parent 94817f64b9
commit dbb2844ed9
20 changed files with 21 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/blenkernel/CMakeLists.txt
View File

@@ -9,7 +9,6 @@ set(INC
../blentranslation
../bmesh
../draw
../functions
../gpencil_modifiers_legacy
../gpu
../ikplugin
@@ -547,7 +546,7 @@ set(LIB
PRIVATE bf::dna
bf_draw
PRIVATE bf::extern::curve_fit_nd
bf_functions
PRIVATE bf::functions
bf_gpencil_modifiers_legacy
bf_gpu
bf_ikplugin

2
source/blender/depsgraph/CMakeLists.txt
View File

@@ -7,7 +7,6 @@ set(INC
../blenkernel
../bmesh
../draw
../functions
../makesrna
../modifiers
../sequencer
@@ -152,6 +151,7 @@ set(LIB
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::dna
PRIVATE bf::functions
PRIVATE bf::intern::atomic
PRIVATE bf::intern::guardedalloc
)

2
source/blender/draw/CMakeLists.txt
View File

@@ -12,7 +12,6 @@ set(INC
../bmesh
../editors/include
../editors/space_view3d
../functions
../gpu
../gpu/intern
../makesrna
@@ -351,6 +350,7 @@ set(LIB
PRIVATE bf::blenlib
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::functions
PRIVATE bf::imbuf
PRIVATE bf::intern::clog
PRIVATE bf::intern::guardedalloc

2
source/blender/editors/curves/CMakeLists.txt
View File

@@ -6,7 +6,6 @@ set(INC
../include
../../blenkernel
../../blentranslation
../../functions
../../geometry
../../gpu
../../makesrna
@@ -36,6 +35,7 @@ set(LIB
PRIVATE bf::blenlib
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::functions
PRIVATE bf::intern::clog
PRIVATE bf::intern::guardedalloc
)

2
source/blender/editors/geometry/CMakeLists.txt
View File

@@ -8,7 +8,6 @@ set(INC
../../blenkernel
../../blentranslation
../../bmesh
../../functions
../../makesrna
../../nodes
../../windowmanager
@@ -35,6 +34,7 @@ set(LIB
PRIVATE bf::depsgraph
PRIVATE bf::dna
bf_editor_object
PRIVATE bf::functions
PRIVATE bf::intern::guardedalloc
bf_windowmanager
)

2
source/blender/editors/interface/CMakeLists.txt
View File

@@ -10,7 +10,6 @@ set(INC
../../blenloader
../../blentranslation
../../draw
../../functions
../../gpu
../../makesrna
../../nodes
@@ -100,6 +99,7 @@ set(LIB
PRIVATE bf::depsgraph
PRIVATE bf::dna
bf_editor_datafiles
PRIVATE bf::functions
PRIVATE bf::imbuf
PRIVATE bf::intern::guardedalloc
PRIVATE bf::animrig

2
source/blender/editors/mesh/CMakeLists.txt
View File

@@ -9,7 +9,6 @@ set(INC
../../blentranslation
../../bmesh
../../draw
../../functions
../../geometry
../../gpu
../../makesrna
@@ -65,6 +64,7 @@ set(LIB
PRIVATE bf::blenlib
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::functions
PRIVATE bf::imbuf
PRIVATE bf::intern::clog
PRIVATE bf::intern::guardedalloc

2
source/blender/editors/object/CMakeLists.txt
View File

@@ -8,7 +8,6 @@ set(INC
../../blenkernel
../../blentranslation
../../bmesh
../../functions
../../gpencil_modifiers_legacy
../../gpu
../../ikplugin
@@ -67,6 +66,7 @@ set(LIB
PRIVATE bf::dna
bf_editor_mesh
bf_editor_grease_pencil
PRIVATE bf::functions
PRIVATE bf::imbuf
PRIVATE bf::intern::clog
PRIVATE bf::intern::guardedalloc

2
source/blender/editors/sculpt_paint/CMakeLists.txt
View File

@@ -9,7 +9,6 @@ set(INC
../../blentranslation
../../bmesh
../../draw
../../functions
../../geometry
../../gpu
../../makesrna
@@ -98,6 +97,7 @@ set(LIB
PRIVATE bf::blenlib
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::functions
PRIVATE bf::imbuf
PRIVATE bf::intern::atomic
PRIVATE bf::intern::clog

2
source/blender/editors/space_node/CMakeLists.txt
View File

@@ -10,7 +10,6 @@ set(INC
../../blentranslation
../../compositor
../../draw
../../functions
../../geometry
../../gpu
../../makesrna
@@ -56,6 +55,7 @@ set(LIB
PRIVATE bf::depsgraph
PRIVATE bf::dna
bf_editor_screen
PRIVATE bf::functions
PRIVATE bf::imbuf
PRIVATE bf::intern::guardedalloc
extern_fmtlib

2
source/blender/editors/space_spreadsheet/CMakeLists.txt
View File

@@ -8,7 +8,6 @@ set(INC
../../blenloader
../../blentranslation
../../bmesh
../../functions
../../gpu
../../makesrna
../../nodes
@@ -53,6 +52,7 @@ set(LIB
PRIVATE bf::blenlib
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::functions
PRIVATE bf::intern::guardedalloc
)

3
source/blender/functions/CMakeLists.txt
View File

@@ -3,7 +3,7 @@
# SPDX-License-Identifier: GPL-2.0-or-later
set(INC
.
PUBLIC .
)
set(INC_SYS
@@ -65,6 +65,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

2
source/blender/geometry/CMakeLists.txt
View File

@@ -6,7 +6,6 @@ set(INC
.
../blenkernel
../blentranslation
../functions
../makesrna
../../../intern/eigen
)
@@ -74,6 +73,7 @@ set(LIB
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::dna
PRIVATE bf::functions
PRIVATE bf::intern::guardedalloc
)

2
source/blender/modifiers/CMakeLists.txt
View File

@@ -10,7 +10,6 @@ set(INC
../blentranslation
../bmesh
../editors/include
../functions
../geometry
../makesrna
../nodes
@@ -110,6 +109,7 @@ set(LIB
PRIVATE bf::blenlib
PRIVATE bf::depsgraph
PUBLIC bf::dna
PRIVATE bf::functions
PRIVATE bf::intern::guardedalloc
)

3
source/blender/nodes/CMakeLists.txt
View File

@@ -58,7 +58,6 @@ set(INC
../blenloader
../blentranslation
../bmesh
../functions
../geometry
../gpu
../makesrna
@@ -125,7 +124,7 @@ set(LIB
bf_bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
bf_functions
PRIVATE bf::functions
PRIVATE bf::imbuf
PRIVATE bf::intern::guardedalloc
bf_nodes_composite

2
source/blender/nodes/composite/CMakeLists.txt
View File

@@ -9,7 +9,6 @@ set(INC
../../editors/include
../../blenkernel
../../blentranslation
../../functions
../../gpu
../../makesrna
../../render
@@ -128,6 +127,7 @@ set(LIB
PRIVATE bf::blenlib
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::functions
PRIVATE bf::imbuf
PRIVATE bf::intern::guardedalloc
bf_realtime_compositor

3
source/blender/nodes/function/CMakeLists.txt
View File

@@ -9,7 +9,6 @@ set(INC
../../blenkernel
../../blentranslation
../../editors/include
../../functions
../../makesrna
../../windowmanager
)
@@ -53,7 +52,7 @@ set(SRC
set(LIB
PRIVATE bf::blenlib
PRIVATE bf::dna
bf_functions
PRIVATE bf::functions
PRIVATE bf::intern::guardedalloc
)

3
source/blender/nodes/geometry/CMakeLists.txt
View File

@@ -10,7 +10,6 @@ set(INC
../../blenkernel
../../blentranslation
../../bmesh
../../functions
../../geometry
../../gpu
../../makesrna
@@ -213,7 +212,7 @@ set(LIB
bf_bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
bf_functions
PRIVATE bf::functions
bf_geometry
PRIVATE bf::imbuf
PRIVATE bf::intern::guardedalloc

3
source/blender/nodes/shader/CMakeLists.txt
View File

@@ -9,7 +9,6 @@ set(INC
../../blenkernel
../../blentranslation
../../editors/include
../../functions
../../gpu
../../makesrna
../../render
@@ -128,7 +127,7 @@ set(LIB
PRIVATE bf::blenlib
PRIVATE bf::depsgraph
PRIVATE bf::dna
bf_functions
PRIVATE bf::functions
PRIVATE bf::imbuf
PRIVATE bf::intern::clog
PRIVATE bf::intern::guardedalloc

2
source/blender/simulation/CMakeLists.txt
View File

@@ -6,7 +6,6 @@ set(INC
.
intern
../blenkernel
../functions
../makesrna
../nodes
)
@@ -33,6 +32,7 @@ set(LIB
PRIVATE bf::blenlib
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::functions
PRIVATE bf::imbuf
PRIVATE bf::intern::guardedalloc
)