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

Cleanup: CMake: Modernize bf_asset_system dependencies

Browse Source 
Pretty straightforward

- Remove any bf_asset_system 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/132357
This commit is contained in:
Ray Molenkamp
2024-12-26 20:47:53 +01:00
committed by Ray molenkamp
parent 167c15e0c0
commit 43d47d272a
17 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,7 +3,7 @@
# SPDX-License-Identifier: GPL-2.0-or-later
set(INC
.
PUBLIC .
intern
intern/library_types
)
@@ -54,6 +54,7 @@ set(LIB
blender_add_lib(bf_asset_system "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
add_library(bf::asset_system ALIAS bf_asset_system)
if(WITH_GTESTS)
set(TEST_INC

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

@@ -4,7 +4,6 @@
set(INC
PUBLIC .
../asset_system
../draw
../ikplugin
../makesrna
@@ -550,7 +549,7 @@ set(SRC
set(LIB
PRIVATE bf::animrig
bf_asset_system
PRIVATE bf::asset_system
PRIVATE bf::blenfont
PRIVATE bf::blenlib
PRIVATE bf::blenloader

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

@@ -4,7 +4,6 @@
set(INC
../include
../../asset_system
../../makesrna
../../../../intern/eigen
# RNA_prototypes.hh
@@ -39,6 +38,7 @@ set(SRC
set(LIB
PRIVATE bf::animrig
PRIVATE bf::asset_system
PRIVATE bf::blenfont
PRIVATE bf::blenkernel
PRIVATE bf::blenlib

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

@@ -5,7 +5,6 @@
set(INC
.
../include
../../asset_system
../../makesrna
# dna_type_offsets.h
${CMAKE_CURRENT_BINARY_DIR}/../../makesdna/intern
@@ -53,6 +52,7 @@ set(SRC
)
set(LIB
PRIVATE bf::asset_system
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blenloader

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

@@ -4,7 +4,6 @@
set(INC
../include
../../asset_system
../../makesrna
# RNA_prototypes.hh
@@ -24,6 +23,7 @@ set(SRC
)
set(LIB
PRIVATE bf::asset_system
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation

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

@@ -6,7 +6,6 @@ set(INC
.
../asset
../include
../../asset_system
../../draw
../../imbuf/movie
../../makesrna
@@ -91,6 +90,7 @@ set(SRC
)
set(LIB
PRIVATE bf::asset_system
PRIVATE bf::blenfont
PRIVATE bf::blenkernel
PRIVATE bf::blenlib

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

@@ -4,7 +4,6 @@
set(INC
../include
../../asset_system
../../geometry
../../ikplugin
../../makesrna
@@ -53,6 +52,7 @@ set(SRC
set(LIB
PRIVATE bf::animrig
PRIVATE bf::asset_system
PRIVATE bf::blenfont
PRIVATE bf::blenkernel
PRIVATE bf::blenlib

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

@@ -5,7 +5,6 @@
set(INC
../asset
../include
../../asset_system
../../makesrna
../../sequencer
../../../../extern/fmtlib/include
@@ -37,6 +36,7 @@ set(SRC
set(LIB
PRIVATE bf::animrig
PRIVATE bf::asset_system
PRIVATE bf::blenfont
PRIVATE bf::blenkernel
PRIVATE bf::blenlib

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

@@ -8,7 +8,6 @@ set(INC
../asset
../include
../uvedit
../../asset_system
../../blenlib
../../draw
../../geometry
@@ -170,6 +169,7 @@ set(SRC
)
set(LIB
PRIVATE bf::asset_system
PRIVATE bf::blenkernel
PRIVATE bf::animrig
PRIVATE bf::blenlib

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

@@ -5,7 +5,6 @@
set(INC
../include
../io
../../asset_system
../../makesrna
)
@@ -18,6 +17,7 @@ set(SRC
)
set(LIB
PRIVATE bf::asset_system
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::dna

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

@@ -5,7 +5,6 @@
set(INC
../asset
../include
../../asset_system
../../imbuf/movie
../../makesrna
@@ -38,6 +37,7 @@ set(SRC
)
set(LIB
PRIVATE bf::asset_system
PRIVATE bf::blenfont
PRIVATE bf::blenkernel
PRIVATE bf::blenlib

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

@@ -5,7 +5,6 @@
set(INC
../include
../io
../../asset_system
../../compositor
../../draw
../../geometry
@@ -43,6 +42,7 @@ set(SRC
set(LIB
PRIVATE bf::animrig
PRIVATE bf::asset_system
PRIVATE bf::blenfont
PRIVATE bf::blenkernel
PRIVATE bf::blenlib

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

@@ -4,7 +4,6 @@
set(INC
../include
../../asset_system
../../makesrna
# RNA_prototypes.hh
@@ -23,6 +22,7 @@ set(SRC
)
set(LIB
PRIVATE bf::asset_system
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blenloader

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

@@ -5,7 +5,6 @@
set(INC
../asset
../include
../../asset_system
../../draw
../../makesrna
../../modifiers
@@ -73,6 +72,7 @@ set(SRC
set(LIB
PRIVATE bf::animrig
PRIVATE bf::asset_system
PRIVATE bf::blenfont
PRIVATE bf::blenkernel
PRIVATE bf::blenlib

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

@@ -4,7 +4,6 @@
set(INC
../include
../../asset_system
../../makesrna
)
@@ -20,6 +19,7 @@ set(SRC
)
set(LIB
PRIVATE bf::asset_system
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blenloader

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

@@ -5,7 +5,6 @@
set(INC
../include
../space_sequencer
../../asset_system
../../makesrna
../../sequencer
# RNA_prototypes.hh
@@ -104,6 +103,7 @@ set(SRC
set(LIB
PRIVATE bf::animrig
PRIVATE bf::asset_system
PRIVATE bf::blenfont
PRIVATE bf::blenkernel
PRIVATE bf::blenlib

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

@@ -6,7 +6,6 @@ set(INC
PUBLIC .
gizmo
gizmo/intern
../asset_system
../compositor
../editors/include
../draw
@@ -89,6 +88,7 @@ set(SRC
)
set(LIB
PRIVATE bf::asset_system
PRIVATE bf::blenfont
PRIVATE bf::blenkernel
PRIVATE bf::blenlib