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

Cleanup: CMake: Modernize bf_bmesh dependencies

Browse Source 
Pretty straightforward

- Remove any bf_bmesh 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/132203
This commit is contained in:
Ray Molenkamp
2024-12-23 17:47:25 +01:00
committed by Ray molenkamp
parent c10ef088a6
commit 2992c63bc3
44 changed files with 45 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,7 +7,6 @@ set(INC
../asset_system
../blenloader
../blentranslation
../bmesh
../draw
../functions
../gpu
@@ -563,7 +562,7 @@ set(LIB
PRIVATE bf::blenlib
bf_blenloader
bf_blentranslation
bf_bmesh
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
bf_draw

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

@@ -8,7 +8,6 @@ set(INC
../blentranslation
../draw
../editors/include
../bmesh
../gpu
../imbuf
../imbuf/movie
@@ -62,6 +61,7 @@ set(LIB
PRIVATE bf::animrig
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::intern::clog

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

@@ -3,7 +3,7 @@
# SPDX-License-Identifier: GPL-2.0-or-later
set(INC
.
PUBLIC .
../blenkernel
../blentranslation
../../../intern/eigen
@@ -210,6 +210,7 @@ if(WITH_TBB)
endif()
blender_add_lib(bf_bmesh "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
add_library(bf::bmesh ALIAS bf_bmesh)
if(MSVC AND NOT MSVC_CLANG)
target_compile_options(bf_bmesh PRIVATE /WX /wd4101)

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

@@ -6,7 +6,6 @@ set(INC
PUBLIC .
../animrig
../blenkernel
../bmesh
../draw
../functions
../makesrna
@@ -154,6 +153,7 @@ set(SRC
set(LIB
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::bmesh
PRIVATE bf::dna
PRIVATE bf::intern::atomic
PRIVATE bf::intern::guardedalloc

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

@@ -9,7 +9,6 @@ set(INC
../blenkernel
../blenloader
../blentranslation
../bmesh
../editors/include
../editors/space_view3d
../functions
@@ -307,6 +306,7 @@ set(LIB
PRIVATE bf::blenfont
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::intern::clog

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

@@ -6,7 +6,6 @@ set(INC
../include
../../blenkernel
../../blentranslation
../../bmesh
../../functions
../../geometry
../../gpu
@@ -37,6 +36,7 @@ set(SRC
set(LIB
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::extern::curve_fit_nd

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

@@ -7,7 +7,6 @@ set(INC
../../asset_system
../../blenkernel
../../blentranslation
../../bmesh
../../functions
../../makesrna
../../nodes
@@ -32,6 +31,7 @@ set(SRC
set(LIB
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
bf_editor_object

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

@@ -6,7 +6,6 @@ set(INC
../include
../../blenkernel
../../blentranslation
../../bmesh
../../gpu
../../makesrna
../../windowmanager
@@ -40,6 +39,7 @@ set(SRC
set(LIB
PRIVATE bf::blenlib
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::intern::clog

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

@@ -6,7 +6,6 @@ set(INC
../include
../../blenkernel
../../blentranslation
../../bmesh
../../gpu
../../imbuf
../../makesrna
@@ -36,6 +35,7 @@ set(LIB
PRIVATE bf::blenfont
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc

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

@@ -6,7 +6,6 @@ set(INC
../include
../../blenkernel
../../blentranslation
../../bmesh
../../gpu
../../imbuf
../../makesrna
@@ -50,6 +49,7 @@ set(LIB
bf_blenkernel
PRIVATE bf::animrig
PRIVATE bf::blenlib
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc

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

@@ -21,7 +21,6 @@ set(INC
../../render
../../windowmanager
../../../../intern/ghost
../../bmesh
# RNA_prototypes.hh
${CMAKE_BINARY_DIR}/source/blender/makesrna
)
@@ -104,6 +103,7 @@ set(LIB
PRIVATE bf::blenfont
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
bf_editor_datafiles

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

@@ -6,7 +6,6 @@ set(INC
../include
../../blenkernel
../../blentranslation
../../bmesh
../../io/alembic
../../io/collada
../../io/common
@@ -53,6 +52,7 @@ set(SRC
set(LIB
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::extern::fmtlib

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

@@ -7,7 +7,6 @@ set(INC
../uvedit
../../blenkernel
../../blentranslation
../../bmesh
../../draw
../../functions
../../geometry
@@ -65,6 +64,7 @@ set(LIB
PRIVATE bf::blenfont
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::extern::fmtlib

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

@@ -7,7 +7,6 @@ set(INC
../../asset_system
../../blenkernel
../../blentranslation
../../bmesh
../../functions
../../geometry
../../gpu
@@ -64,6 +63,7 @@ set(LIB
PRIVATE bf::blenfont
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
bf_editor_mesh

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

@@ -7,7 +7,6 @@ set(INC
../../blenkernel
../../blenloader
../../blentranslation
../../bmesh
../../draw
../../gpu
../../imbuf
@@ -38,6 +37,7 @@ set(SRC
set(LIB
PRIVATE bf::blenlib
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
bf_draw

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

@@ -9,7 +9,6 @@ set(INC
../../blenkernel
../../blenloader
../../blentranslation
../../bmesh
../../gpu
../../imbuf
../../makesrna
@@ -46,6 +45,7 @@ set(LIB
PRIVATE bf::animrig
PRIVATE bf::blenfont
PRIVATE bf::blenlib
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
bf_editor_datafiles

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

@@ -13,7 +13,6 @@ set(INC
../../blenlib
../../blenloader
../../blentranslation
../../bmesh
../../draw
../../functions
../../geometry
@@ -183,6 +182,7 @@ set(LIB
bf_blenkernel
PRIVATE bf::animrig
PRIVATE bf::blenlib
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::extern::fmtlib

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

@@ -7,7 +7,6 @@ set(INC
../../blenkernel
../../blenloader
../../blentranslation
../../bmesh
../../gpu
../../makesrna
../../windowmanager
@@ -30,6 +29,7 @@ set(SRC
set(LIB
PRIVATE bf::blenlib
PRIVATE bf::bmesh
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
)

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

@@ -8,7 +8,6 @@ set(INC
../../blenkernel
../../blenloader
../../blentranslation
../../bmesh
../../draw
../../gpu
../../imbuf
@@ -40,6 +39,7 @@ set(LIB
PRIVATE bf::blenfont
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
bf_editor_uvedit

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

@@ -7,7 +7,6 @@ set(INC
../../blenkernel
../../blenloader
../../blentranslation
../../bmesh
../../gpu
../../imbuf
../../makesrna
@@ -35,6 +34,7 @@ set(SRC
set(LIB
PRIVATE bf::blenfont
PRIVATE bf::blenlib
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc

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

@@ -7,7 +7,6 @@ set(INC
../../blenkernel
../../blenloader
../../blentranslation
../../bmesh
../../functions
../../gpu
../../makesrna
@@ -51,6 +50,7 @@ set(SRC
set(LIB
PRIVATE bf::blenfont
PRIVATE bf::blenlib
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::extern::fmtlib

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

@@ -9,7 +9,6 @@ set(INC
../../blenkernel
../../blenloader
../../blentranslation
../../bmesh
../../draw
../../functions
../../gpu
@@ -85,6 +84,7 @@ set(LIB
PRIVATE bf::animrig
PRIVATE bf::blenfont
PRIVATE bf::blenlib
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
bf_editor_curves

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

@@ -6,7 +6,6 @@ set(INC
../include
../../blenkernel
../../blentranslation
../../bmesh
../../gpu
../../ikplugin
../../makesrna
@@ -117,7 +116,7 @@ set(LIB
PRIVATE bf::extern::fmtlib
bf_blenkernel
PRIVATE bf::blenlib
bf_bmesh
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
bf_editor_mask

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

@@ -8,7 +8,6 @@ set(INC
../../blenkernel
../../blenloader
../../blentranslation
../../bmesh
../../makesrna
../../windowmanager
)
@@ -27,6 +26,7 @@ set(SRC
set(LIB
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::bmesh
PRIVATE bf::dna
PRIVATE bf::intern::clog
PRIVATE bf::intern::guardedalloc

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

@@ -8,7 +8,6 @@ set(INC
../../asset_system
../../blenkernel
../../blentranslation
../../bmesh
../../gpu
../../imbuf
../../makesrna
@@ -112,6 +111,7 @@ set(LIB
PRIVATE bf::animrig
PRIVATE bf::blenfont
PRIVATE bf::blenlib
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::intern::clog

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

@@ -6,7 +6,6 @@ set(INC
../include
../../blenkernel
../../blentranslation
../../bmesh
../../geometry
../../gpu
../../makesrna
@@ -38,7 +37,7 @@ set(SRC
set(LIB
PRIVATE bf::blenlib
bf_bmesh
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc

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

@@ -6,7 +6,6 @@ set(INC
.
../blenkernel
../blentranslation
../bmesh
../functions
../makesrna
../../../intern/eigen
@@ -102,6 +101,7 @@ set(SRC
set(LIB
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::bmesh
PRIVATE bf::dna
PRIVATE bf::intern::atomic
PRIVATE bf::intern::guardedalloc

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

@@ -10,7 +10,6 @@ set(INC
opengl
vulkan
../blenkernel
../bmesh
../draw
../imbuf
../makesrna
@@ -382,6 +381,7 @@ set(METAL_SRC
set(LIB
PRIVATE bf::blenlib
PRIVATE bf::bmesh
PRIVATE bf::dna
PRIVATE bf::intern::atomic
PRIVATE bf::intern::clog

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

@@ -8,7 +8,6 @@ set(INC
../../blenkernel
../../blenloader
../../blentranslation
../../bmesh
../../editors/include
../../makesrna
../../windowmanager
@@ -86,6 +85,7 @@ set(SRC
set(LIB
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::intern::clog

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

@@ -29,7 +29,6 @@ set(INC
../../makesrna
../../windowmanager
../../../../intern/iksolver/extern
../../bmesh
)
set(INC_SYS
@@ -115,6 +114,7 @@ set(LIB
${XML2_LIBRARIES}
PRIVATE bf::animrig
PRIVATE bf::blenlib
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc

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

@@ -7,7 +7,6 @@ set(INC
../common
../../blenkernel
../../blenloader
../../bmesh
../../editors/include
../../functions
../../geometry
@@ -33,6 +32,7 @@ set(SRC
set(LIB
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::extern::nanosvg

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

@@ -9,7 +9,6 @@ set(INC
intern
../common
../../blenkernel
../../bmesh
../../geometry
../../makesrna
../../windowmanager
@@ -52,6 +51,7 @@ set(SRC
set(LIB
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::intern::clog

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

@@ -9,7 +9,6 @@ set(INC
intern
../common
../../blenkernel
../../bmesh
../../editors/include
../../makesrna
../../windowmanager
@@ -42,6 +41,7 @@ set(SRC
set(LIB
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::intern::clog

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

@@ -47,7 +47,6 @@ set(INC
../../blenkernel
../../blenloader
../../blentranslation
../../bmesh
../../editors/include
../../imbuf
../../makesrna
@@ -197,6 +196,7 @@ endif()
set(LIB
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::animrig

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

@@ -8,7 +8,6 @@ set(INC
importer
../common
../../blenkernel
../../bmesh
../../bmesh/intern
../../editors/include
../../makesrna
@@ -55,6 +54,7 @@ set(SRC
set(LIB
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::intern::clog

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

@@ -9,7 +9,6 @@ set(INC
../blenkernel
../blenloader
../blentranslation
../bmesh
../editors/include
../functions
../geometry
@@ -143,6 +142,7 @@ set(LIB
PRIVATE bf::blenfont
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PUBLIC bf::dna
PRIVATE bf::intern::guardedalloc

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

@@ -58,7 +58,6 @@ set(INC
../blenkernel
../blenloader
../blentranslation
../bmesh
../depsgraph
../functions
../geometry
@@ -142,7 +141,7 @@ set(SRC
set(LIB
PRIVATE bf::blenlib
bf_bmesh
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
bf_functions

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

@@ -11,7 +11,6 @@ set(INC
../../blenkernel
../../blenloader
../../blentranslation
../../bmesh
../../functions
../../geometry
../../gpu
@@ -249,7 +248,7 @@ set(SRC
set(LIB
PRIVATE bf::blenlib
bf_bmesh
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
bf_functions

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

@@ -9,7 +9,6 @@ set(INC
../../editors/include
../../blenkernel
../../blentranslation
../../bmesh
../../imbuf
../../makesrna
../../render
@@ -58,6 +57,7 @@ set(SRC
set(LIB
PRIVATE bf::blenlib
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc

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

@@ -5,7 +5,6 @@
set(INC
.
../../blenkernel
../../bmesh
)
set(INC_SYS
@@ -37,6 +36,7 @@ set(SRC
set(LIB
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc

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

@@ -5,7 +5,6 @@
set(INC
.
../../blenkernel
../../bmesh
../../imbuf
)
@@ -41,6 +40,7 @@ set(SRC
set(LIB
PRIVATE bf::blenlib
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
bf_imbuf

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

@@ -7,7 +7,6 @@ set(INC
intern
../blenkernel
../blentranslation
../bmesh
../editors/include
../makesrna
../render
@@ -43,6 +42,7 @@ set(SRC
set(LIB
PRIVATE bf::blenfont
PRIVATE bf::blenlib
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc

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

@@ -21,7 +21,6 @@ set(INC
../render
../sequencer
../../../intern/memutil
../bmesh
# RNA_prototypes.hh
${CMAKE_BINARY_DIR}/source/blender/makesrna
@@ -99,6 +98,7 @@ set(SRC
set(LIB
PRIVATE bf::blenfont
PRIVATE bf::blenlib
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
bf_editor_screen

2
source/creator/CMakeLists.txt
View File

@@ -9,7 +9,6 @@ set(INC
../blender/imbuf
../blender/imbuf/movie
../blender/io/usd
../blender/bmesh
../blender/makesrna
../blender/render
../blender/windowmanager
@@ -17,6 +16,7 @@ set(INC
set(LIB
PRIVATE bf::blenlib
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::intern::clog