dillongoostudios/goo-engine
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup: CMake: Modernize bf_bmesh dependencies

Browse Source 
Pretty straightforward

- Remove any 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/110363
This commit is contained in:
Ray molenkamp
2023-07-22 02:05:21 +02:00
parent 8165b70e58
commit 19422044ed
43 changed files with 44 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/blender/blenkernel/CMakeLists.txt
+1 -2
View File
@@ -6,7 +6,6 @@ set(INC
PUBLIC .
../asset_system
../blenloader
../bmesh
../draw
../functions
../gpencil_modifiers_legacy
@@ -526,7 +525,7 @@ set(LIB
PRIVATE bf::blenlib
bf_blenloader
PRIVATE bf::blentranslation
bf_bmesh
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
bf_draw
source/blender/blenloader/CMakeLists.txt
+1 -1
View File
@@ -12,7 +12,6 @@ set(INC
../nodes
../render
../sequencer
../bmesh
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
@@ -58,6 +57,7 @@ set(LIB
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::intern::clog
source/blender/bmesh/CMakeLists.txt
+2 -1
View File
@@ -3,7 +3,7 @@
# SPDX-License-Identifier: GPL-2.0-or-later
set(INC
.
PUBLIC .
../../../intern/eigen
../../../extern/rangetree
)
@@ -217,6 +217,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)
source/blender/depsgraph/CMakeLists.txt
+1 -1
View File
@@ -4,7 +4,6 @@
set(INC
PUBLIC .
../bmesh
../draw
../functions
../makesrna
@@ -151,6 +150,7 @@ set(SRC
set(LIB
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::bmesh
PRIVATE bf::dna
PRIVATE bf::intern::atomic
PRIVATE bf::intern::guardedalloc
source/blender/draw/CMakeLists.txt
+1 -1
View File
@@ -7,7 +7,6 @@ set(INC
intern
../blenloader
../bmesh
../editors/include
../editors/space_view3d
../functions
@@ -350,6 +349,7 @@ set(LIB
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::intern::clog
source/blender/editors/curves/CMakeLists.txt
+1 -1
View File
@@ -8,7 +8,6 @@ set(INC
../../geometry
../../gpu
../../makesrna
../../bmesh
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
@@ -28,6 +27,7 @@ set(LIB
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::intern::clog
source/blender/editors/geometry/CMakeLists.txt
+1 -1
View File
@@ -8,7 +8,6 @@ set(INC
../../functions
../../makesrna
../../nodes
../../bmesh
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
@@ -29,6 +28,7 @@ set(LIB
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
bf_editor_object
source/blender/editors/gizmo_library/CMakeLists.txt
+1 -1
View File
@@ -4,7 +4,6 @@
set(INC
../include
../../bmesh
../../gpu
../../makesrna
../../../../intern/eigen
@@ -39,6 +38,7 @@ set(LIB
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::intern::clog
source/blender/editors/gpencil_legacy/CMakeLists.txt
+1 -1
View File
@@ -7,7 +7,6 @@ set(INC
../../gpu
../../imbuf
../../makesrna
../../bmesh
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
)
@@ -56,6 +55,7 @@ set(LIB
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
source/blender/editors/interface/CMakeLists.txt
+1 -1
View File
@@ -17,7 +17,6 @@ set(INC
../../render
../../../../intern/ghost
../../../../extern/fmtlib/include
../../bmesh
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
)
@@ -94,6 +93,7 @@ set(LIB
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
bf_editor_datafiles
source/blender/editors/io/CMakeLists.txt
+1 -1
View File
@@ -4,7 +4,6 @@
set(INC
../include
../../bmesh
../../io/alembic
../../io/collada
../../io/common
@@ -48,6 +47,7 @@ set(LIB
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
source/blender/editors/mesh/CMakeLists.txt
+1 -1
View File
@@ -5,7 +5,6 @@
set(INC
../include
../uvedit
../../bmesh
../../draw
../../functions
../../geometry
@@ -59,6 +58,7 @@ set(LIB
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::intern::clog
source/blender/editors/object/CMakeLists.txt
+1 -1
View File
@@ -4,7 +4,6 @@
set(INC
../include
../../bmesh
../../functions
../../gpencil_modifiers_legacy
../../gpu
@@ -59,6 +58,7 @@ set(LIB
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
bf_editor_mesh
source/blender/editors/render/CMakeLists.txt
+1 -1
View File
@@ -5,7 +5,6 @@
set(INC
../include
../../blenloader
../../bmesh
../../draw
../../gpu
../../imbuf
@@ -33,6 +32,7 @@ set(LIB
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
bf_draw
source/blender/editors/screen/CMakeLists.txt
+1 -1
View File
@@ -5,7 +5,6 @@
set(INC
../include
../../blenloader
../../bmesh
../../gpu
../../imbuf
../../makesrna
@@ -41,6 +40,7 @@ set(LIB
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
bf_editor_datafiles
source/blender/editors/sculpt_paint/CMakeLists.txt
+1 -1
View File
@@ -5,7 +5,6 @@
set(INC
../include
../uvedit
../../bmesh
../../draw
../../functions
../../geometry
@@ -92,6 +91,7 @@ set(LIB
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::intern::atomic
source/blender/editors/space_buttons/CMakeLists.txt
+1 -1
View File
@@ -7,7 +7,6 @@ set(INC
../../blenloader
../../gpu
../../makesrna
../../bmesh
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
@@ -29,6 +28,7 @@ set(LIB
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
PRIVATE bf::bmesh
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
PRIVATE bf::windowmanager
source/blender/editors/space_image/CMakeLists.txt
+1 -1
View File
@@ -5,7 +5,6 @@
set(INC
../include
../../blenloader
../../bmesh
../../draw
../../gpu
../../imbuf
@@ -36,6 +35,7 @@ set(LIB
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
bf_editor_uvedit
source/blender/editors/space_info/CMakeLists.txt
+1 -1
View File
@@ -5,7 +5,6 @@
set(INC
../include
../../blenloader
../../bmesh
../../gpu
../../imbuf
../../makesrna
@@ -34,6 +33,7 @@ set(LIB
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
source/blender/editors/space_spreadsheet/CMakeLists.txt
+1 -1
View File
@@ -5,7 +5,6 @@
set(INC
../include
../../blenloader
../../bmesh
../../functions
../../gpu
../../makesrna
@@ -50,6 +49,7 @@ set(LIB
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
source/blender/editors/space_view3d/CMakeLists.txt
+1 -1
View File
@@ -6,7 +6,6 @@ set(INC
../include
../../asset_system
../../blenloader
../../bmesh
../../draw
../../gpu
../../imbuf
@@ -70,6 +69,7 @@ set(LIB
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
bf_editor_curves
source/blender/editors/transform/CMakeLists.txt
+1 -2
View File
@@ -4,7 +4,6 @@
set(INC
../include
../../bmesh
../../gpu
../../ikplugin
../../makesrna
@@ -114,7 +113,7 @@ set(LIB
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
bf_bmesh
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
bf_editor_mask
source/blender/editors/undo/CMakeLists.txt
+1 -1
View File
@@ -7,7 +7,6 @@ set(INC
../../asset_system
../../blenloader
../../makesrna
../../bmesh
)
set(INC_SYS
@@ -25,6 +24,7 @@ set(LIB
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
PRIVATE bf::bmesh
PRIVATE bf::dna
bf_editor_curve
bf_editor_curves
source/blender/editors/util/CMakeLists.txt
+1 -1
View File
@@ -6,7 +6,6 @@ set(INC
../include
../space_sequencer
../../asset_system
../../bmesh
../../gpu
../../imbuf
../../makesrna
@@ -105,6 +104,7 @@ set(LIB
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::intern::clog
source/blender/editors/uvedit/CMakeLists.txt
+1 -2
View File
@@ -4,7 +4,6 @@
set(INC
../include
../../bmesh
../../geometry
../../gpu
../../makesrna
@@ -37,7 +36,7 @@ set(LIB
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
bf_bmesh
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
source/blender/gpencil_modifiers_legacy/CMakeLists.txt
+1 -1
View File
@@ -5,7 +5,6 @@
set(INC
.
intern
../bmesh
../editors/include
../makesrna
../render
@@ -87,6 +86,7 @@ set(LIB
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
source/blender/gpu/CMakeLists.txt
+1 -1
View File
@@ -8,7 +8,6 @@ set(INC
metal
opengl
vulkan
../bmesh
../draw
../imbuf
../makesrna
@@ -315,6 +314,7 @@ set(METAL_SRC
set(LIB
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::bmesh
PRIVATE bf::dna
PRIVATE bf::intern::atomic
${Epoxy_LIBRARIES}
source/blender/io/alembic/CMakeLists.txt
+1 -1
View File
@@ -6,7 +6,6 @@ set(INC
.
../common
../../blenloader
../../bmesh
../../editors/include
../../makesrna
../../../../intern/utfconv
@@ -86,6 +85,7 @@ set(LIB
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::intern::clog
source/blender/io/collada/CMakeLists.txt
+1 -1
View File
@@ -26,7 +26,6 @@ set(INC
../../makesrna
../../ikplugin
../../../../intern/iksolver/extern
../../bmesh
)
set(INC_SYS
@@ -113,6 +112,7 @@ set(LIB
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
source/blender/io/gpencil/CMakeLists.txt
+1 -1
View File
@@ -6,7 +6,6 @@ set(INC
.
../common
../../blenloader
../../bmesh
../../editors/include
../../makesdna
../../makesrna
@@ -33,6 +32,7 @@ set(SRC
set(LIB
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::extern::nanosvg
source/blender/io/ply/CMakeLists.txt
+1 -1
View File
@@ -8,7 +8,6 @@ set(INC
importer
intern
../common
../../bmesh
../../geometry
../../makesrna
)
@@ -51,6 +50,7 @@ set(SRC
set(LIB
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
source/blender/io/stl/CMakeLists.txt
+1 -1
View File
@@ -6,7 +6,6 @@ set(INC
.
importer
../common
../../bmesh
../../bmesh/intern
../../editors/include
../../makesrna
@@ -34,6 +33,7 @@ set(SRC
set(LIB
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
source/blender/io/usd/CMakeLists.txt
+1 -1
View File
@@ -47,7 +47,6 @@ set(INC
.
../common
../../blenloader
../../bmesh
../../editors/include
../../imbuf
../../makesrna
@@ -124,6 +123,7 @@ set(LIB
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
bf_imbuf
source/blender/io/wavefront_obj/CMakeLists.txt
+1 -1
View File
@@ -7,7 +7,6 @@ set(INC
exporter
importer
../common
../../bmesh
../../bmesh/intern
../../editors/include
../../makesrna
@@ -54,6 +53,7 @@ set(SRC
set(LIB
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
source/blender/modifiers/CMakeLists.txt
+1 -1
View File
@@ -6,7 +6,6 @@ set(INC
.
intern
../blenloader
../bmesh
../editors/include
../functions
../geometry
@@ -106,6 +105,7 @@ set(LIB
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PUBLIC bf::dna
PRIVATE bf::intern::guardedalloc
source/blender/nodes/CMakeLists.txt
+1 -2
View File
@@ -17,7 +17,6 @@ set(INC
shader
texture
../editors/include
../bmesh
../functions
../geometry
../gpu
@@ -79,7 +78,7 @@ set(LIB
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
bf_bmesh
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
bf_functions
source/blender/nodes/geometry/CMakeLists.txt
+1 -2
View File
@@ -7,7 +7,6 @@ set(INC
..
../intern
../../editors/include
../../bmesh
../../functions
../../geometry
../../gpu
@@ -199,7 +198,7 @@ set(LIB
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
bf_bmesh
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
bf_functions
source/blender/nodes/texture/CMakeLists.txt
+1 -1
View File
@@ -10,7 +10,6 @@ set(INC
../../imbuf
../../makesrna
../../render
../../bmesh
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
)
@@ -57,6 +56,7 @@ set(LIB
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
source/blender/python/bmesh/CMakeLists.txt
+1 -1
View File
@@ -4,7 +4,6 @@
set(INC
.
../../bmesh
)
set(INC_SYS
@@ -36,6 +35,7 @@ set(SRC
set(LIB
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
source/blender/python/mathutils/CMakeLists.txt
+1 -1
View File
@@ -4,7 +4,6 @@
set(INC
.
../../bmesh
../../imbuf
)
@@ -41,6 +40,7 @@ set(SRC
set(LIB
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
bf_imbuf
source/blender/shader_fx/CMakeLists.txt
+1 -1
View File
@@ -5,7 +5,6 @@
set(INC
.
intern
../bmesh
../editors/include
../makesrna
../render
@@ -42,6 +41,7 @@ set(LIB
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
source/blender/windowmanager/CMakeLists.txt
+1 -1
View File
@@ -19,7 +19,6 @@ set(INC
../sequencer
../../../intern/ghost
../../../intern/memutil
../bmesh
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
@@ -96,6 +95,7 @@ set(LIB
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
bf_editor_screen
source/creator/CMakeLists.txt
+1 -1
View File
@@ -7,7 +7,6 @@ set(INC
../blender/gpu
../blender/imbuf
../blender/io/usd
../blender/bmesh
../blender/makesrna
../blender/render
)
@@ -15,6 +14,7 @@ set(INC
set(LIB
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::intern::clog