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

Cleanup: CMake: Modernize bf_blenloader dependencies

Browse Source 
Pretty straightforward

- Remove any bf_blenloader 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/132334
This commit is contained in:
Ray Molenkamp
2024-12-25 18:40:41 +01:00
committed by Ray molenkamp
parent c331c6b50e
commit a23aab3ddc
39 changed files with 40 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,7 +5,6 @@
set(INC
PUBLIC .
../asset_system
../blenloader
../draw
../functions
../ikplugin
@@ -558,7 +557,7 @@ set(LIB
bf_asset_system
PRIVATE bf::blenfont
PRIVATE bf::blenlib
bf_blenloader
PRIVATE bf::blenloader
PRIVATE bf::blentranslation
PRIVATE bf::bmesh
PRIVATE bf::depsgraph

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

@@ -3,7 +3,7 @@
# SPDX-License-Identifier: GPL-2.0-or-later
set(INC
.
PUBLIC .
../draw
../editors/include
../imbuf
@@ -89,6 +89,7 @@ if(WIN32)
endif()
blender_add_lib(bf_blenloader "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
add_library(bf::blenloader ALIAS bf_blenloader)
# RNA_prototypes.hh
add_dependencies(bf_blenloader bf_rna)

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

@@ -6,7 +6,6 @@ set(INC
.
intern
../blenloader
../editors/include
../editors/space_view3d
../functions
@@ -302,6 +301,7 @@ set(LIB
PRIVATE bf::blenfont
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blenloader
PRIVATE bf::blentranslation
PRIVATE bf::bmesh
PRIVATE bf::depsgraph

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

@@ -5,7 +5,6 @@
set(INC
../include
../../asset_system
../../blenloader
../../makesrna
../../../../intern/eigen
# RNA_prototypes.hh
@@ -43,6 +42,7 @@ set(LIB
PRIVATE bf::blenfont
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blenloader
PRIVATE bf::blentranslation
PRIVATE bf::depsgraph
PRIVATE bf::dna

3
source/blender/editors/asset/CMakeLists.txt
View File

@@ -6,7 +6,6 @@ set(INC
.
../include
../../asset_system
../../blenloader
../../makesrna
# dna_type_offsets.h
${CMAKE_CURRENT_BINARY_DIR}/../../makesdna/intern
@@ -56,7 +55,7 @@ set(SRC
set(LIB
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
bf_blenloader
PRIVATE bf::blenloader
PRIVATE bf::blentranslation
PRIVATE bf::dna
PRIVATE bf::intern::clog

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

@@ -7,7 +7,6 @@ set(INC
../asset
../include
../../asset_system
../../blenloader
../../draw
../../functions
../../imbuf
@@ -99,6 +98,7 @@ set(LIB
PRIVATE bf::blenfont
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blenloader
PRIVATE bf::blentranslation
PRIVATE bf::bmesh
PRIVATE bf::depsgraph

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

@@ -4,7 +4,6 @@
set(INC
../include
../../blenloader
../../draw
../../imbuf
../../imbuf/movie
@@ -34,6 +33,7 @@ set(SRC
set(LIB
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blenloader
PRIVATE bf::blentranslation
PRIVATE bf::bmesh
PRIVATE bf::depsgraph

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

@@ -6,7 +6,6 @@ set(INC
../asset
../include
../../asset_system
../../blenloader
../../imbuf
../../makesrna
../../sequencer
@@ -42,6 +41,7 @@ set(LIB
PRIVATE bf::blenfont
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blenloader
PRIVATE bf::blentranslation
PRIVATE bf::bmesh
PRIVATE bf::depsgraph

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

@@ -10,7 +10,6 @@ set(INC
../uvedit
../../asset_system
../../blenlib
../../blenloader
../../draw
../../functions
../../geometry
@@ -178,6 +177,7 @@ set(LIB
PRIVATE bf::blenkernel
PRIVATE bf::animrig
PRIVATE bf::blenlib
PRIVATE bf::blenloader
PRIVATE bf::blentranslation
PRIVATE bf::bmesh
PRIVATE bf::depsgraph

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

@@ -4,7 +4,6 @@
set(INC
../include
../../blenloader
../../makesrna
../../modifiers
@@ -31,6 +30,7 @@ set(LIB
PRIVATE bf::blenkernel
PRIVATE bf::animrig
PRIVATE bf::blenlib
PRIVATE bf::blenloader
PRIVATE bf::blentranslation
PRIVATE bf::depsgraph
PRIVATE bf::dna

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

@@ -4,7 +4,6 @@
set(INC
../include
../../blenloader
../../makesrna
# RNA_prototypes.hh
@@ -26,6 +25,7 @@ set(SRC
set(LIB
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blenloader
PRIVATE bf::blentranslation
PRIVATE bf::bmesh
PRIVATE bf::dna

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

@@ -4,7 +4,6 @@
set(INC
../include
../../blenloader
../../imbuf
../../imbuf/movie
../../makesrna
@@ -45,6 +44,7 @@ set(LIB
PRIVATE bf::blenfont
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blenloader
PRIVATE bf::blentranslation
PRIVATE bf::depsgraph
PRIVATE bf::dna

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

@@ -4,7 +4,6 @@
set(INC
../include
../../blenloader
../../makesrna
)
@@ -24,6 +23,7 @@ set(LIB
PRIVATE bf::blenfont
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blenloader
PRIVATE bf::dna
PRIVATE bf::gpu
PRIVATE bf::intern::guardedalloc

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

@@ -6,7 +6,6 @@ set(INC
../asset
../include
../../asset_system
../../blenloader
../../imbuf
../../imbuf/movie
../../makesrna
@@ -44,6 +43,7 @@ set(LIB
PRIVATE bf::blenfont
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blenloader
PRIVATE bf::blentranslation
PRIVATE bf::dna
PRIVATE bf::gpu

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

@@ -4,7 +4,6 @@
set(INC
../include
../../blenloader
../../makesrna
# RNA_prototypes.hh
@@ -31,6 +30,7 @@ set(SRC
set(LIB
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blenloader
PRIVATE bf::blentranslation
PRIVATE bf::depsgraph
PRIVATE bf::dna

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

@@ -5,7 +5,6 @@
set(INC
../asset
../include
../../blenloader
../../draw
../../imbuf
../../imbuf/movie
@@ -35,6 +34,7 @@ set(LIB
PRIVATE bf::blenfont
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blenloader
PRIVATE bf::blentranslation
PRIVATE bf::bmesh
PRIVATE bf::depsgraph

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

@@ -4,7 +4,6 @@
set(INC
../include
../../blenloader
../../imbuf
../../makesrna
@@ -31,6 +30,7 @@ set(LIB
PRIVATE bf::blenfont
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blenloader
PRIVATE bf::blentranslation
PRIVATE bf::bmesh
PRIVATE bf::depsgraph

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

@@ -4,7 +4,6 @@
set(INC
../include
../../blenloader
../../makesrna
# RNA_prototypes.hh
@@ -30,6 +29,7 @@ set(LIB
PRIVATE bf::blenkernel
PRIVATE bf::animrig
PRIVATE bf::blenlib
PRIVATE bf::blenloader
PRIVATE bf::blentranslation
PRIVATE bf::depsgraph
PRIVATE bf::dna

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

@@ -6,7 +6,6 @@ set(INC
../include
../io
../../asset_system
../../blenloader
../../compositor
../../draw
../../functions
@@ -51,6 +50,7 @@ set(LIB
PRIVATE bf::blenfont
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blenloader
PRIVATE bf::blentranslation
PRIVATE bf::depsgraph
PRIVATE bf::dna

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

@@ -5,7 +5,6 @@
set(INC
../include
../../blenfont
../../blenloader
../../imbuf
../../makesrna
../../sequencer
@@ -133,6 +132,7 @@ set(LIB
PRIVATE bf::animrig
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blenloader
PRIVATE bf::blentranslation
PRIVATE bf::depsgraph
PRIVATE bf::dna

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

@@ -4,7 +4,6 @@
set(INC
../include
../../blenloader
../../makesrna
)
@@ -23,6 +22,7 @@ set(SRC
set(LIB
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blenloader
PRIVATE bf::blentranslation
PRIVATE bf::dna
PRIVATE bf::gpu

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

@@ -4,7 +4,6 @@
set(INC
../include
../../blenloader
../../draw
../../imbuf
../../imbuf/movie
@@ -53,6 +52,7 @@ set(LIB
PRIVATE bf::blenfont
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blenloader
PRIVATE bf::blentranslation
PRIVATE bf::depsgraph
PRIVATE bf::dna

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

@@ -4,7 +4,6 @@
set(INC
../include
../../blenloader
../../functions
../../makesrna
../../nodes
@@ -47,6 +46,7 @@ set(LIB
PRIVATE bf::blenfont
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blenloader
PRIVATE bf::blentranslation
PRIVATE bf::bmesh
PRIVATE bf::depsgraph

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

@@ -4,7 +4,6 @@
set(INC
../include
../../blenloader
../../makesrna
# RNA_prototypes.hh
@@ -21,6 +20,7 @@ set(SRC
set(LIB
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blenloader
PRIVATE bf::blentranslation
PRIVATE bf::dna
PRIVATE bf::gpu

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

@@ -4,7 +4,6 @@
set(INC
../include
../../blenloader
../../makesrna
)
@@ -34,6 +33,7 @@ set(LIB
PRIVATE bf::blenfont
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blenloader
PRIVATE bf::blentranslation
PRIVATE bf::dna
PRIVATE bf::gpu

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

@@ -4,7 +4,6 @@
set(INC
../include
../../blenloader
../../makesrna
# RNA_prototypes.hh
@@ -21,6 +20,7 @@ set(SRC
set(LIB
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blenloader
PRIVATE bf::blentranslation
PRIVATE bf::dna
PRIVATE bf::gpu

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

@@ -5,7 +5,6 @@
set(INC
../include
../../asset_system
../../blenloader
../../makesrna
# RNA_prototypes.hh
@@ -26,6 +25,7 @@ set(SRC
set(LIB
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blenloader
PRIVATE bf::blentranslation
PRIVATE bf::dna
PRIVATE bf::extern::fmtlib

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

@@ -6,7 +6,6 @@ set(INC
../asset
../include
../../asset_system
../../blenloader
../../draw
../../functions
../../imbuf
@@ -81,6 +80,7 @@ set(LIB
PRIVATE bf::blenfont
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blenloader
PRIVATE bf::blentranslation
PRIVATE bf::bmesh
PRIVATE bf::depsgraph

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

@@ -5,7 +5,6 @@
set(INC
../include
../../asset_system
../../blenloader
../../makesrna
)
@@ -23,6 +22,7 @@ set(SRC
set(LIB
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blenloader
PRIVATE bf::blentranslation
PRIVATE bf::bmesh
PRIVATE bf::dna

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

@@ -7,7 +7,6 @@ add_subdirectory(movie)
set(INC
.
./movie
../blenloader
../makesrna
../sequencer
../../../intern/memutil
@@ -73,7 +72,7 @@ set(SRC
set(LIB
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
bf_blenloader
PRIVATE bf::blenloader
PRIVATE bf::dna
PRIVATE bf::gpu
bf_imbuf_openimageio

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

@@ -5,7 +5,6 @@
set(INC
.
../common
../../blenloader
../../editors/include
../../makesrna
../../../../intern/utfconv
@@ -82,6 +81,7 @@ set(SRC
set(LIB
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blenloader
PRIVATE bf::blentranslation
PRIVATE bf::bmesh
PRIVATE bf::depsgraph

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

@@ -5,7 +5,6 @@
set(INC
.
../common
../../blenloader
../../editors/include
../../functions
../../geometry
@@ -30,6 +29,7 @@ set(SRC
set(LIB
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blenloader
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna

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

@@ -44,7 +44,6 @@ endif()
set(INC
.
../common
../../blenloader
../../editors/include
../../imbuf
../../makesrna
@@ -193,6 +192,7 @@ endif()
set(LIB
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blenloader
PRIVATE bf::blentranslation
PRIVATE bf::bmesh
PRIVATE bf::depsgraph

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

@@ -6,7 +6,6 @@ set(INC
.
intern
intern/lineart
../blenloader
../editors/include
../functions
../geometry
@@ -139,6 +138,7 @@ set(LIB
PRIVATE bf::blenfont
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blenloader
PRIVATE bf::blentranslation
PRIVATE bf::bmesh
PRIVATE bf::depsgraph

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

@@ -55,7 +55,6 @@ set(INC
texture
../animrig
../editors/include
../blenloader
../depsgraph
../functions
../geometry
@@ -138,6 +137,7 @@ set(SRC
set(LIB
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blenloader
PRIVATE bf::blentranslation
PRIVATE bf::bmesh
PRIVATE bf::depsgraph

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

@@ -8,7 +8,6 @@ set(INC
include
../intern
../../editors/include
../../blenloader
../../functions
../../geometry
../../imbuf
@@ -245,6 +244,7 @@ set(SRC
set(LIB
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blenloader
PRIVATE bf::blentranslation
PRIVATE bf::bmesh
PRIVATE bf::depsgraph

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

@@ -4,7 +4,6 @@
set(INC
..
../../blenloader
../../editors/include
../../imbuf
../../imbuf/intern/oiio
@@ -118,6 +117,7 @@ set(SRC
set(LIB
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blenloader
PRIVATE bf::blentranslation
PRIVATE bf::depsgraph
PRIVATE bf::dna

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

@@ -6,7 +6,6 @@ set(INC
.
intern
../animrig
../blenloader
../imbuf
../imbuf/movie
../makesrna
@@ -84,6 +83,7 @@ set(LIB
PRIVATE bf::blenfont
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blenloader
PRIVATE bf::blentranslation
PRIVATE bf::depsgraph
PRIVATE bf::dna

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

@@ -7,7 +7,6 @@ set(INC
gizmo
gizmo/intern
../asset_system
../blenloader
../compositor
../editors/include
../draw
@@ -96,6 +95,7 @@ set(LIB
PRIVATE bf::blenfont
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blenloader
PRIVATE bf::blentranslation
PRIVATE bf::bmesh
PRIVATE bf::depsgraph