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

Cleanup: CMake: Modernize bf_imbuf dependencies

Browse Source 
Pretty straightforward

- Remove any bf_imbuf 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/115425
This commit is contained in:
Ray Molenkamp
2023-11-25 23:37:24 +01:00
committed by Ray molenkamp
parent 6b70c04724
commit 1b6cd937ff
45 changed files with 46 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
intern/ghost/CMakeLists.txt
View File

@@ -4,7 +4,6 @@
set(INC
PUBLIC .
../../source/blender/imbuf
)
set(INC_SYS
@@ -72,6 +71,7 @@ set(SRC
set(LIB
PRIVATE bf::blenlib
PRIVATE bf::dna
PRIVATE bf::imbuf
PRIVATE bf::intern::clog
)

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

@@ -7,7 +7,6 @@ set(INC
../blenkernel
../blentranslation
../gpu
../imbuf
../makesrna
)
@@ -34,6 +33,7 @@ set(LIB
PRIVATE bf::blenlib
PRIVATE bf::dna
bf_gpu
PRIVATE bf::imbuf
PRIVATE bf::intern::guardedalloc
${FREETYPE_LIBRARIES} ${BROTLI_LIBRARIES}

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

@@ -13,7 +13,6 @@ set(INC
../gpencil_modifiers_legacy
../gpu
../ikplugin
../imbuf
../makesrna
../modifiers
../nodes
@@ -550,7 +549,7 @@ set(LIB
bf_gpencil_modifiers_legacy
bf_gpu
bf_ikplugin
bf_imbuf
PRIVATE bf::imbuf
PRIVATE bf::intern::clog
bf_intern_ghost
PRIVATE bf::intern::guardedalloc

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

@@ -9,7 +9,6 @@ set(INC
../draw
../editors/include
../gpu
../imbuf
../makesrna
../nodes
../render
@@ -63,6 +62,7 @@ set(LIB
PRIVATE bf::blenlib
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::imbuf
PRIVATE bf::intern::clog
PRIVATE bf::intern::guardedalloc
)

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

@@ -5,7 +5,6 @@
set(INC
.
../blenkernel
../imbuf
../makesrna
../../../intern/locale
)
@@ -25,6 +24,7 @@ set(LIB
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::dna
PRIVATE bf::imbuf
PRIVATE bf::intern::guardedalloc
)

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

@@ -12,7 +12,6 @@ if(WITH_COMPOSITOR_CPU)
operations
../blenkernel
../blentranslation
../imbuf
../makesrna
../nodes
../windowmanager
@@ -600,6 +599,7 @@ if(WITH_COMPOSITOR_CPU)
PRIVATE bf::blenlib
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::imbuf
PRIVATE bf::intern::clog
PRIVATE bf::intern::guardedalloc
extern_clew

3
source/blender/compositor/realtime_compositor/CMakeLists.txt
View File

@@ -10,7 +10,6 @@ set(INC
../../blentranslation
../../draw
../../gpu
../../imbuf
../../makesrna
../../nodes
../../render
@@ -112,7 +111,7 @@ set(LIB
bf_gpu
PRIVATE bf::intern::guardedalloc
bf_nodes
bf_imbuf
PRIVATE bf::imbuf
bf_render
PRIVATE bf::blenlib
bf_blenkernel

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

@@ -15,7 +15,6 @@ set(INC
../functions
../gpu
../gpu/intern
../imbuf
../makesrna
../nodes
../render
@@ -352,6 +351,7 @@ set(LIB
PRIVATE bf::blenlib
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::imbuf
PRIVATE bf::intern::clog
PRIVATE bf::intern::guardedalloc
bf_realtime_compositor

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

@@ -8,7 +8,6 @@ set(INC
../../blentranslation
../../bmesh
../../gpu
../../imbuf
../../makesrna
../../windowmanager
# RNA_prototypes.h
@@ -61,6 +60,7 @@ set(LIB
PRIVATE bf::blenlib
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::imbuf
PRIVATE bf::intern::guardedalloc
)

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

@@ -8,7 +8,6 @@ set(INC
../../blentranslation
../../bmesh
../../gpu
../../imbuf
../../makesrna
../../windowmanager
../../../../extern/curve_fit_nd
@@ -36,6 +35,7 @@ set(LIB
PRIVATE bf::blenlib
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::imbuf
PRIVATE bf::intern::guardedalloc
extern_curve_fit_nd
)

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

@@ -12,7 +12,6 @@ set(INC
../../draw
../../functions
../../gpu
../../imbuf
../../makesrna
../../nodes
../../python
@@ -101,6 +100,7 @@ set(LIB
PRIVATE bf::depsgraph
PRIVATE bf::dna
bf_editor_datafiles
PRIVATE bf::imbuf
PRIVATE bf::intern::guardedalloc
PRIVATE bf::animrig
)

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

@@ -12,7 +12,6 @@ set(INC
../../functions
../../geometry
../../gpu
../../imbuf
../../makesrna
../../render
../../windowmanager
@@ -66,6 +65,7 @@ set(LIB
PRIVATE bf::blenlib
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::imbuf
PRIVATE bf::intern::clog
PRIVATE bf::intern::guardedalloc
bf_windowmanager

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

@@ -12,7 +12,6 @@ set(INC
../../gpencil_modifiers_legacy
../../gpu
../../ikplugin
../../imbuf
../../makesrna
../../modifiers
../../python
@@ -68,6 +67,7 @@ set(LIB
PRIVATE bf::dna
bf_editor_mesh
bf_editor_grease_pencil
PRIVATE bf::imbuf
PRIVATE bf::intern::clog
PRIVATE bf::intern::guardedalloc
bf_render

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

@@ -10,7 +10,6 @@ set(INC
../../bmesh
../../draw
../../gpu
../../imbuf
../../makesrna
../../nodes
../../render
@@ -40,6 +39,7 @@ set(LIB
PRIVATE bf::depsgraph
PRIVATE bf::dna
bf_draw
PRIVATE bf::imbuf
PRIVATE bf::intern::guardedalloc
)

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

@@ -11,7 +11,6 @@ set(INC
../../blentranslation
../../bmesh
../../gpu
../../imbuf
../../makesrna
../../sequencer
../../windowmanager
@@ -49,6 +48,7 @@ set(LIB
PRIVATE bf::dna
bf_editor_datafiles
bf_editor_space_sequencer
PRIVATE bf::imbuf
PRIVATE bf::intern::guardedalloc
)

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

@@ -12,7 +12,6 @@ set(INC
../../functions
../../geometry
../../gpu
../../imbuf
../../makesrna
../../nodes
../../render
@@ -99,6 +98,7 @@ set(LIB
PRIVATE bf::blenlib
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::imbuf
PRIVATE bf::intern::atomic
PRIVATE bf::intern::clog
PRIVATE bf::intern::guardedalloc

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

@@ -8,7 +8,6 @@ set(INC
../../blenloader
../../blentranslation
../../gpu
../../imbuf
../../makesrna
../../windowmanager
@@ -50,6 +49,7 @@ set(LIB
PRIVATE bf::blenlib
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::imbuf
PRIVATE bf::intern::guardedalloc
)

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

@@ -10,7 +10,6 @@ set(INC
../../blenloader
../../blentranslation
../../gpu
../../imbuf
../../makesrna
../../render
../../windowmanager
@@ -49,6 +48,7 @@ set(LIB
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::dna
PRIVATE bf::imbuf
PRIVATE bf::intern::guardedalloc
extern_fmtlib
PRIVATE bf::intern::atomic

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

@@ -10,7 +10,6 @@ set(INC
../../bmesh
../../draw
../../gpu
../../imbuf
../../makesrna
../../render
../../windowmanager
@@ -41,6 +40,7 @@ set(LIB
PRIVATE bf::depsgraph
PRIVATE bf::dna
bf_editor_uvedit
PRIVATE bf::imbuf
PRIVATE bf::intern::clog
PRIVATE bf::intern::guardedalloc
)

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

@@ -9,7 +9,6 @@ set(INC
../../blentranslation
../../bmesh
../../gpu
../../imbuf
../../makesrna
../../windowmanager
@@ -37,6 +36,7 @@ set(LIB
PRIVATE bf::blenlib
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::imbuf
PRIVATE bf::intern::guardedalloc
)

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

@@ -13,7 +13,6 @@ set(INC
../../functions
../../geometry
../../gpu
../../imbuf
../../makesrna
../../nodes
../../render
@@ -57,6 +56,7 @@ set(LIB
PRIVATE bf::depsgraph
PRIVATE bf::dna
bf_editor_screen
PRIVATE bf::imbuf
PRIVATE bf::intern::guardedalloc
extern_fmtlib
)

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

@@ -8,7 +8,6 @@ set(INC
../../blenloader
../../blentranslation
../../gpu
../../imbuf
../../makesrna
../../sequencer
../../windowmanager
@@ -135,6 +134,7 @@ set(LIB
PRIVATE bf::depsgraph
PRIVATE bf::dna
bf_editor_undo
PRIVATE bf::imbuf
PRIVATE bf::intern::clog
PRIVATE bf::intern::guardedalloc
)

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

@@ -9,7 +9,6 @@ set(INC
../../blentranslation
../../draw
../../gpu
../../imbuf
../../makesrna
../../sequencer
../../windowmanager
@@ -52,6 +51,7 @@ set(LIB
PRIVATE bf::dna
bf_editor_interface
bf_editor_util
PRIVATE bf::imbuf
PRIVATE bf::intern::atomic
PRIVATE bf::intern::guardedalloc
)

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

@@ -12,7 +12,6 @@ set(INC
../../bmesh
../../draw
../../gpu
../../imbuf
../../makesrna
../../render
../../windowmanager
@@ -86,6 +85,7 @@ set(LIB
bf_editor_curves
bf_editor_lattice
bf_editor_mesh
PRIVATE bf::imbuf
PRIVATE bf::intern::guardedalloc
)

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

@@ -10,7 +10,6 @@ set(INC
../../blentranslation
../../bmesh
../../gpu
../../imbuf
../../makesrna
../../sequencer
../../windowmanager
@@ -112,6 +111,7 @@ set(LIB
PRIVATE bf::blenlib
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::imbuf
PRIVATE bf::intern::clog
PRIVATE bf::intern::guardedalloc
)

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

@@ -533,6 +533,7 @@ set(LIB
PRIVATE bf::blenlib
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::imbuf
PRIVATE bf::intern::guardedalloc
bf_python_mathutils
@@ -544,7 +545,6 @@ set(INC
.
../blenkernel
../blentranslation
../imbuf
../makesrna
../python
../python/intern

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

@@ -12,7 +12,6 @@ set(INC
../blenkernel
../bmesh
../draw
../imbuf
../makesrna
# For theme color access.
@@ -330,6 +329,7 @@ set(METAL_SRC
set(LIB
PRIVATE bf::blenlib
PRIVATE bf::dna
PRIVATE bf::imbuf
PRIVATE bf::intern::atomic
PRIVATE bf::intern::clog
PRIVATE bf::intern::guardedalloc

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

@@ -3,7 +3,7 @@
# SPDX-License-Identifier: GPL-2.0-or-later
set(INC
.
PUBLIC .
../blenkernel
../blenloader
../gpu
@@ -188,3 +188,4 @@ set_source_files_properties(
)
blender_add_lib(bf_imbuf "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
add_library(bf::imbuf ALIAS bf_imbuf)

2
source/blender/io/avi/CMakeLists.txt
View File

@@ -4,7 +4,6 @@
set(INC
.
../../imbuf
)
set(INC_SYS
@@ -32,6 +31,7 @@ set(LIB
${JPEG_LIBRARIES}
PRIVATE bf::blenlib
PRIVATE bf::dna
PRIVATE bf::imbuf
PRIVATE bf::intern::guardedalloc
)

2
source/blender/io/collada/CMakeLists.txt
View File

@@ -25,7 +25,6 @@ set(INC
../../blentranslation
../../editors/include
../../ikplugin
../../imbuf
../../makesrna
../../windowmanager
../../../../intern/iksolver/extern
@@ -117,6 +116,7 @@ set(LIB
PRIVATE bf::blenlib
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::imbuf
PRIVATE bf::intern::guardedalloc
)

3
source/blender/io/usd/CMakeLists.txt
View File

@@ -62,7 +62,6 @@ set(INC
../../blentranslation
../../bmesh
../../editors/include
../../imbuf
../../makesrna
../../nodes
../../python/intern
@@ -184,7 +183,7 @@ set(LIB
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::animrig
bf_imbuf
PRIVATE bf::imbuf
PRIVATE bf::intern::clog
PRIVATE bf::intern::guardedalloc
bf_io_common

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

@@ -61,7 +61,6 @@ set(INC
../functions
../geometry
../gpu
../imbuf
../makesrna
../modifiers
../render
@@ -127,6 +126,7 @@ set(LIB
PRIVATE bf::depsgraph
PRIVATE bf::dna
bf_functions
PRIVATE bf::imbuf
PRIVATE bf::intern::guardedalloc
bf_nodes_composite
bf_nodes_function

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

@@ -11,7 +11,6 @@ set(INC
../../blentranslation
../../functions
../../gpu
../../imbuf
../../makesrna
../../render
../../windowmanager
@@ -129,6 +128,7 @@ set(LIB
PRIVATE bf::blenlib
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::imbuf
PRIVATE bf::intern::guardedalloc
bf_realtime_compositor
)

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

@@ -13,7 +13,6 @@ set(INC
../../functions
../../geometry
../../gpu
../../imbuf
../../makesrna
../../modifiers
../../render
@@ -216,6 +215,7 @@ set(LIB
PRIVATE bf::dna
bf_functions
bf_geometry
PRIVATE bf::imbuf
PRIVATE bf::intern::guardedalloc
bf_nodes
extern_fmtlib

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

@@ -11,7 +11,6 @@ set(INC
../../editors/include
../../functions
../../gpu
../../imbuf
../../makesrna
../../render
../../windowmanager
@@ -130,6 +129,7 @@ set(LIB
PRIVATE bf::depsgraph
PRIVATE bf::dna
bf_functions
PRIVATE bf::imbuf
PRIVATE bf::intern::clog
PRIVATE bf::intern::guardedalloc
bf_intern_sky

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

@@ -10,7 +10,6 @@ set(INC
../../blenkernel
../../blentranslation
../../bmesh
../../imbuf
../../makesrna
../../render
../../windowmanager
@@ -60,6 +59,7 @@ set(LIB
PRIVATE bf::blenlib
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::imbuf
PRIVATE bf::intern::guardedalloc
bf_nodes
)

2
source/blender/python/gpu/CMakeLists.txt
View File

@@ -7,7 +7,6 @@ set(INC
../../blenkernel
../../editors/include
../../gpu
../../imbuf
)
set(INC_SYS
@@ -62,6 +61,7 @@ set(LIB
${PYTHON_LIBRARIES}
PRIVATE bf::blenlib
PRIVATE bf::dna
PRIVATE bf::imbuf
PRIVATE bf::intern::guardedalloc
)

2
source/blender/python/intern/CMakeLists.txt
View File

@@ -9,7 +9,6 @@ set(INC
../../blentranslation
../../editors/include
../../gpu
../../imbuf
../../imbuf/intern/oiio
../../makesrna
../../windowmanager
@@ -124,6 +123,7 @@ set(LIB
bf_editor_animation
bf_editor_interface
bf_editor_space_api
PRIVATE bf::imbuf
PRIVATE bf::intern::clog
PRIVATE bf::intern::guardedalloc
PRIVATE bf::animrig

3
source/blender/python/mathutils/CMakeLists.txt
View File

@@ -6,7 +6,6 @@ set(INC
.
../../blenkernel
../../bmesh
../../imbuf
)
set(INC_SYS
@@ -43,7 +42,7 @@ set(LIB
PRIVATE bf::blenlib
PRIVATE bf::depsgraph
PRIVATE bf::dna
bf_imbuf
PRIVATE bf::imbuf
PRIVATE bf::intern::guardedalloc
bf_python_ext

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

@@ -13,7 +13,6 @@ set(INC
../draw
../gpu
../gpu/intern
../imbuf
../makesrna
../nodes
../sequencer
@@ -62,6 +61,7 @@ set(LIB
PRIVATE bf::blenlib
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::imbuf
PRIVATE bf::intern::guardedalloc
bf_realtime_compositor
PRIVATE bf::intern::atomic

2
source/blender/render/hydra/CMakeLists.txt
View File

@@ -39,7 +39,6 @@ set(INC
../../../../intern/guardedalloc
../../blenkernel
../../blenlib
../../imbuf
../../makesdna
../../makesrna
../../nodes
@@ -69,6 +68,7 @@ set(LIB
${USD_LIBRARIES}
${TBB_LIBRARIES}
PRIVATE bf::depsgraph
PRIVATE bf::imbuf
PRIVATE bf::intern::clog
bf_io_usd
)

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

@@ -8,7 +8,6 @@ set(INC
../blenkernel
../blenloader
../blentranslation
../imbuf
../makesrna
../render
../windowmanager
@@ -84,6 +83,7 @@ set(LIB
PRIVATE bf::blenlib
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::imbuf
PRIVATE bf::intern::atomic
PRIVATE bf::intern::clog
PRIVATE bf::intern::guardedalloc

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

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

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

@@ -14,7 +14,6 @@ set(INC
../editors/include
../draw
../gpu
../imbuf
../makesrna
../nodes
../render
@@ -101,6 +100,7 @@ set(LIB
PRIVATE bf::depsgraph
PRIVATE bf::dna
bf_editor_screen
PRIVATE bf::imbuf
PRIVATE bf::intern::clog
PRIVATE bf::intern::guardedalloc
PRIVATE bf::animrig

2
source/creator/CMakeLists.txt
View File

@@ -6,7 +6,6 @@ set(INC
../blender/blenkernel
../blender/editors/include
../blender/gpu
../blender/imbuf
../blender/io/usd
../blender/bmesh
../blender/makesrna
@@ -18,6 +17,7 @@ set(LIB
PRIVATE bf::blenlib
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::imbuf
PRIVATE bf::intern::clog
PRIVATE bf::intern::guardedalloc
bf_windowmanager