kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Cleanup: CMake: Modernize bf_guardedalloc dependencies

Browse Source 
Pretty straightforward

- Removes any guardedalloc paths from INC
- Adds a dependency though LIB

Pull Request: https://projects.blender.org/blender/blender/pulls/109925
This commit is contained in:
Ray Molenkamp 2023-07-10 18:44:19 +02:00 committed by Ray molenkamp
parent fc58d92acb
commit 57ad866d81
107 changed files with 113 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
intern/clog/CMakeLists.txt
View File

@ -5,7 +5,6 @@
set(INC
.
../atomic
../guardedalloc
)
set(INC_SYS
@ -19,6 +18,7 @@ set(SRC
)
set(LIB
PRIVATE bf::intern::guardedalloc
)
# Disabled for makesdna/makesrna.

2
intern/cycles/blender/CMakeLists.txt
View File

@ -4,7 +4,6 @@
set(INC
..
../../guardedalloc
../../mikktspace
../../../source/blender/makesrna
../../../source/blender/blenkernel
@ -60,6 +59,7 @@ set(SRC
set(LIB
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
cycles_bvh
cycles_device
cycles_graph

4
intern/guardedalloc/CMakeLists.txt
View File

@ -7,8 +7,7 @@ if(HAVE_MALLOC_STATS_H)
endif()
set(INC
.
..
PUBLIC .
)
set(INC_SYS
@ -55,6 +54,7 @@ if(WITH_MEM_JEMALLOC AND NOT ("${JEMALLOC_VERSION}" VERSION_LESS "5.0.0"))
endif()
blender_add_lib(bf_intern_guardedalloc "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
add_library(bf::intern::guardedalloc ALIAS bf_intern_guardedalloc)
# Override C++ alloc, optional.
if(WITH_CXX_GUARDEDALLOC)

2
intern/mantaflow/CMakeLists.txt
View File

@ -35,7 +35,6 @@ set(INC_SYS
../../extern/mantaflow/helper/util
../../extern/mantaflow/helper/pwrapper
../../extern/mantaflow/preprocessed
../guardedalloc
${PYTHON_INCLUDE_DIRS}
${ZLIB_INCLUDE_DIRS}
)
@ -74,6 +73,7 @@ set(SRC
set(LIB
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
extern_mantaflow
${PYTHON_LINKFLAGS}

2
intern/opencolorio/CMakeLists.txt
View File

@ -4,7 +4,6 @@
set(INC
.
../guardedalloc
../../source/blender/blenlib
../../source/blender/gpu
../../source/blender/gpu/intern
@ -25,6 +24,7 @@ set(SRC
set(LIB
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
)
if(WITH_OPENCOLORIO)

2
intern/opensubdiv/CMakeLists.txt
View File

@ -4,7 +4,6 @@
set(INC
.
../guardedalloc
)
set(INC_SYS
@ -19,6 +18,7 @@ set(SRC
)
set(LIB
PRIVATE bf::intern::guardedalloc
)
if(WITH_OPENSUBDIV)

2
intern/openvdb/CMakeLists.txt
View File

@ -4,7 +4,6 @@
set(INC
.
../guardedalloc
)
set(INC_SYS
@ -15,6 +14,7 @@ set(SRC
)
set(LIB
PRIVATE bf::intern::guardedalloc
)
if(WITH_OPENVDB)

2
intern/quadriflow/CMakeLists.txt
View File

@ -4,7 +4,6 @@
set(INC
.
../guardedalloc
)
set(INC_SYS
@ -19,6 +18,7 @@ set(SRC
)
set(LIB
PRIVATE bf::intern::guardedalloc
extern_quadriflow
${BOOST_LIBRARIES}
)

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

@ -8,7 +8,6 @@ set(INC
../blenkernel
../blenlib
../../../intern/clog
../../../intern/guardedalloc
)
set(INC_SYS
@ -43,6 +42,7 @@ set(SRC
set(LIB
bf_blenkernel
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
)

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

@ -10,7 +10,6 @@ set(INC
../gpu
../imbuf
../makesrna
../../../intern/guardedalloc
)
set(INC_SYS
@ -35,7 +34,7 @@ set(SRC
set(LIB
PRIVATE bf::dna
bf_gpu
bf_intern_guardedalloc
PRIVATE bf::intern::guardedalloc
${FREETYPE_LIBRARIES} ${BROTLI_LIBRARIES}
)

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

@ -26,7 +26,6 @@ set(INC
../simulation
../../../intern/eigen
../../../intern/ghost
../../../intern/guardedalloc
../../../intern/iksolver/extern
../../../intern/clog
../../../intern/libmv
@ -545,7 +544,7 @@ set(LIB
bf_imbuf
bf_intern_clog
bf_intern_ghost
bf_intern_guardedalloc
PRIVATE bf::intern::guardedalloc
bf_intern_libmv # Uses stub when disabled.
bf_intern_mikktspace
bf_intern_opensubdiv # Uses stub when disabled.

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

@ -10,7 +10,6 @@ set(INC
.
..
../../../intern/eigen
../../../intern/guardedalloc
)
set(INC_SYS
@ -390,7 +389,7 @@ set(SRC
set(LIB
PUBLIC bf::dna
bf_intern_eigen
bf_intern_guardedalloc
PRIVATE bf::intern::guardedalloc
extern_wcwidth
PRIVATE bf::intern::atomic
${ZLIB_LIBRARIES}

3
source/blender/blenlib/tests/performance/CMakeLists.txt
View File

@ -6,7 +6,6 @@ set(INC
.
..
../..
../../../../../intern/guardedalloc
)
set(INC_SYS
@ -15,7 +14,7 @@ set(INC_SYS
set(LIB
PRIVATE bf_blenlib
PRIVATE bf::dna
PRIVATE bf_intern_guardedalloc
PRIVATE PRIVATE bf::intern::guardedalloc
PRIVATE bf::intern::atomic
)

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

@ -19,7 +19,6 @@ set(INC
../sequencer
../windowmanager
../../../intern/clog
../../../intern/guardedalloc
../bmesh
# RNA_prototypes.h
@ -65,6 +64,7 @@ set(LIB
bf_blenkernel
bf_blenlib
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
)
if(WITH_BUILDINFO)

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

@ -8,7 +8,6 @@ set(INC
../blenlib
../imbuf
../makesrna
../../../intern/guardedalloc
../../../intern/locale
)
@ -27,6 +26,7 @@ set(LIB
bf_blenkernel
bf_blenlib
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
)
if(WITH_INTERNATIONAL)

5
source/blender/blentranslation/msgfmt/CMakeLists.txt
View File

@ -6,7 +6,6 @@
# Build msgfmt executable
set(INC
../../../../intern/guardedalloc
../../blenlib
)
@ -15,8 +14,8 @@ set(SRC
)
set(LIB
bf_blenlib
bf_intern_guardedalloc
PRIVATE bf_blenlib
PRIVATE bf::intern::guardedalloc
${ZLIB_LIBRARIES}
${PLATFORM_LINKLIBS})

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

@ -10,7 +10,6 @@ set(INC
../depsgraph
../../../intern/clog
../../../intern/eigen
../../../intern/guardedalloc
../../../extern/rangetree
)
@ -171,6 +170,7 @@ set(LIB
bf_blenkernel
bf_blenlib
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
extern_rangetree
PRIVATE bf::intern::atomic
)

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

@ -24,7 +24,6 @@ if(WITH_COMPOSITOR_CPU)
../render/intern
../../../extern/clew/include
../../../intern/clog
../../../intern/guardedalloc
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
@ -599,6 +598,7 @@ if(WITH_COMPOSITOR_CPU)
bf_blenkernel
bf_blenlib
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
extern_clew
PRIVATE bf::intern::atomic
)

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

@ -16,7 +16,6 @@ set(INC
../../nodes
../../render
../../gpu/intern
../../../../intern/guardedalloc
)
@ -100,6 +99,7 @@ set(SRC
set(LIB
PRIVATE bf::dna
bf_gpu
PRIVATE bf::intern::guardedalloc
bf_nodes
bf_imbuf
bf_render

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

@ -13,7 +13,6 @@ set(INC
../modifiers
../sequencer
../windowmanager
../../../intern/guardedalloc
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
)
@ -156,6 +155,7 @@ set(LIB
bf_blenkernel
PRIVATE bf::dna
PRIVATE bf::intern::atomic
PRIVATE bf::intern::guardedalloc
)
if(WITH_PYTHON)

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

@ -29,7 +29,6 @@ set(INC
../windowmanager
../../../intern/clog
../../../intern/guardedalloc
../../../intern/opensubdiv
)
@ -357,6 +356,7 @@ set(LIB
bf_blenkernel
bf_blenlib
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
bf_realtime_compositor
bf_windowmanager
PRIVATE bf::intern::atomic

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

@ -13,7 +13,6 @@ set(INC
../../sequencer
../../windowmanager
../../../../intern/clog
../../../../intern/guardedalloc
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
)
@ -48,6 +47,7 @@ set(LIB
bf_blenkernel
bf_blenlib
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
)
if(WITH_PYTHON)

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

@ -16,7 +16,6 @@ set(INC
../../windowmanager
../../../../intern/clog
../../../../intern/eigen
../../../../intern/guardedalloc
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
)
@ -51,6 +50,7 @@ set(LIB
bf_blenkernel
bf_blenlib
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
)

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

@ -13,7 +13,6 @@ set(INC
../../makesrna
../../windowmanager
../../../../intern/clog
../../../../intern/guardedalloc
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
)
@ -54,6 +53,7 @@ set(LIB
bf_blenkernel
bf_blenloader
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
)
blender_add_lib(bf_editor_asset "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

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

@ -12,7 +12,6 @@ set(INC
../../makesrna
../../windowmanager
../../../../intern/clog
../../../../intern/guardedalloc
../../../../extern/curve_fit_nd
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
@ -40,6 +39,7 @@ set(LIB
bf_blenkernel
bf_blenlib
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
extern_curve_fit_nd
)

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

@ -14,7 +14,6 @@ set(INC
../../makesrna
../../windowmanager
../../../../intern/clog
../../../../intern/guardedalloc
../../bmesh
# RNA_prototypes.h
@ -35,6 +34,7 @@ set(LIB
bf_blenkernel
bf_blenlib
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
)
if(WITH_TBB)

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

@ -13,7 +13,6 @@ set(INC
../../makesrna
../../nodes
../../windowmanager
../../../../intern/guardedalloc
../../bmesh
# RNA_prototypes.h
@ -36,6 +35,7 @@ set(LIB
bf_depsgraph
PRIVATE bf::dna
bf_editor_object
PRIVATE bf::intern::guardedalloc
bf_windowmanager
)

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

@ -14,7 +14,6 @@ set(INC
../../windowmanager
../../../../intern/clog
../../../../intern/eigen
../../../../intern/guardedalloc
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
)
@ -44,6 +43,7 @@ set(SRC
set(LIB
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
)

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

@ -13,7 +13,6 @@ set(INC
../../imbuf
../../makesrna
../../windowmanager
../../../../intern/guardedalloc
../../bmesh
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
@ -62,6 +61,7 @@ set(LIB
bf_blenkernel
bf_blenlib
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
)
if(WITH_POTRACE)

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

@ -12,7 +12,6 @@ set(INC
../../imbuf
../../makesrna
../../windowmanager
../../../../intern/guardedalloc
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
)
@ -33,6 +32,7 @@ set(LIB
bf_blenkernel
bf_blenlib
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
)
blender_add_lib(bf_editor_grease_pencil "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

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

@ -22,7 +22,6 @@ set(INC
../../render
../../windowmanager
../../../../intern/ghost
../../../../intern/guardedalloc
../../bmesh
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
@ -100,6 +99,7 @@ set(LIB
bf_blenlib
PRIVATE bf::dna
bf_editor_datafiles
PRIVATE bf::intern::guardedalloc
)
if(WITH_INTERNATIONAL)

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

@ -19,7 +19,6 @@ set(INC
../../io/wavefront_obj
../../makesrna
../../windowmanager
../../../../intern/guardedalloc
)
set(INC_SYS
@ -54,6 +53,7 @@ set(LIB
bf_blenkernel
bf_blenlib
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
)
if(WITH_OPENCOLLADA)

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

@ -11,7 +11,6 @@ set(INC
../../render
../../windowmanager
../../../../intern/clog
../../../../intern/guardedalloc
)
set(INC_SYS
@ -29,6 +28,7 @@ set(SRC
set(LIB
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
)
blender_add_lib(bf_editor_lattice "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

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

@ -10,7 +10,6 @@ set(INC
../../gpu
../../makesrna
../../windowmanager
../../../../intern/guardedalloc
)
set(INC_SYS
@ -32,6 +31,7 @@ set(SRC
set(LIB
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
)

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

@ -20,7 +20,6 @@ set(INC
../../render
../../windowmanager
../../../../intern/clog
../../../../intern/guardedalloc
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
)
@ -66,6 +65,7 @@ set(LIB
bf_blenkernel
bf_blenlib
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
bf_windowmanager
)

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

@ -12,7 +12,6 @@ set(INC
../../render
../../windowmanager
../../../../intern/clog
../../../../intern/guardedalloc
)
set(INC_SYS
@ -29,6 +28,7 @@ set(SRC
set(LIB
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
)
blender_add_lib(bf_editor_metaball "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

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

@ -22,7 +22,6 @@ set(INC
../../shader_fx
../../windowmanager
../../../../intern/clog
../../../../intern/guardedalloc
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
@ -68,6 +67,7 @@ set(LIB
PRIVATE bf::dna
bf_editor_mesh
bf_editor_grease_pencil
PRIVATE bf::intern::guardedalloc
bf_render
bf_windowmanager
)

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

@ -12,7 +12,6 @@ set(INC
../../makesrna
../../windowmanager
../../../../intern/clog
../../../../intern/guardedalloc
../../../../intern/mantaflow/extern
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
@ -42,6 +41,7 @@ set(LIB
bf_blenkernel
bf_blenlib
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
)
if(WITH_MOD_FLUID)

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

@ -18,7 +18,6 @@ set(INC
../../render
../../sequencer
../../windowmanager
../../../../intern/guardedalloc
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
)
@ -38,6 +37,7 @@ set(SRC
set(LIB
PRIVATE bf::dna
bf_draw
PRIVATE bf::intern::guardedalloc
)
if(WITH_HEADLESS)

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

@ -11,7 +11,6 @@ set(INC
../../makesrna
../../sequencer
../../windowmanager
../../../../intern/guardedalloc
)
set(INC_SYS
@ -26,6 +25,7 @@ set(LIB
bf_blenkernel
bf_blenlib
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
)

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

@ -16,7 +16,6 @@ set(INC
../../makesrna
../../sequencer
../../windowmanager
../../../../intern/guardedalloc
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
)
@ -47,6 +46,7 @@ set(LIB
PRIVATE bf::dna
bf_editor_datafiles
bf_editor_space_sequencer
PRIVATE bf::intern::guardedalloc
)

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

@ -21,7 +21,6 @@ set(INC
../../windowmanager
../../../../intern/clog
../../../../intern/eigen
../../../../intern/guardedalloc
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
)
@ -98,6 +97,7 @@ set(LIB
bf_blenlib
PRIVATE bf::dna
PRIVATE bf::intern::atomic
PRIVATE bf::intern::guardedalloc
)
if(WITH_TBB)

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

@ -10,7 +10,6 @@ set(INC
../../makesrna
../../sequencer
../../windowmanager
../../../../intern/guardedalloc
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
)
@ -29,6 +28,7 @@ set(LIB
bf_blenkernel
bf_blenlib
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
)
if(WITH_AUDASPACE)

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

@ -12,7 +12,6 @@ set(INC
../../gpu
../../makesrna
../../windowmanager
../../../../intern/guardedalloc
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
@ -37,6 +36,7 @@ set(LIB
bf_blenkernel
bf_blenlib
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
)

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

@ -11,7 +11,6 @@ set(INC
../../gpu
../../makesrna
../../windowmanager
../../../../intern/guardedalloc
)
set(INC_SYS
@ -44,6 +43,7 @@ set(LIB
bf_editor_space_topbar
bf_editor_space_userpref
bf_editor_space_view3d
PRIVATE bf::intern::guardedalloc
)
blender_add_lib(bf_editor_space_api "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

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

@ -11,7 +11,6 @@ set(INC
../../gpu
../../makesrna
../../windowmanager
../../../../intern/guardedalloc
../../bmesh
# RNA_prototypes.h
@ -32,6 +31,7 @@ set(SRC
set(LIB
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
)

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

@ -14,7 +14,6 @@ set(INC
../../imbuf
../../makesrna
../../windowmanager
../../../../intern/guardedalloc
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
@ -52,6 +51,7 @@ set(LIB
bf_blenkernel
bf_blenlib
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
)

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

@ -11,7 +11,6 @@ set(INC
../../gpu
../../makesrna
../../windowmanager
../../../../intern/guardedalloc
)
@ -30,6 +29,7 @@ set(LIB
bf_blenkernel
bf_blenlib
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
)
if(WITH_PYTHON)

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

@ -16,7 +16,6 @@ set(INC
../../makesrna
../../render
../../windowmanager
../../../../intern/guardedalloc
../../../../extern/fmtlib/include
# RNA_prototypes.h
@ -48,6 +47,7 @@ set(SRC
set(LIB
bf_blenkernel
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
extern_fmtlib
PRIVATE bf::intern::atomic
)

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

@ -12,7 +12,6 @@ set(INC
../../gpu
../../makesrna
../../windowmanager
../../../../intern/guardedalloc
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
@ -39,6 +38,7 @@ set(LIB
bf_blenkernel
bf_blenlib
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
)
if(WITH_AUDASPACE)

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

@ -18,7 +18,6 @@ set(INC
../../render
../../windowmanager
../../../../intern/clog
../../../../intern/guardedalloc
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
@ -44,6 +43,7 @@ set(LIB
bf_blenlib
PRIVATE bf::dna
bf_editor_uvedit
PRIVATE bf::intern::guardedalloc
)
if(WITH_IMAGE_OPENJPEG)

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

@ -15,7 +15,6 @@ set(INC
../../imbuf
../../makesrna
../../windowmanager
../../../../intern/guardedalloc
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
@ -38,6 +37,7 @@ set(SRC
set(LIB
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
)

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

@ -12,7 +12,6 @@ set(INC
../../gpu
../../makesrna
../../windowmanager
../../../../intern/guardedalloc
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
@ -37,6 +36,7 @@ set(LIB
bf_blenkernel
bf_blenlib
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
)

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

@ -21,7 +21,6 @@ set(INC
../../nodes
../../render
../../windowmanager
../../../../intern/guardedalloc
../../../../extern/fmtlib/include
# RNA_prototypes.h
@ -57,6 +56,7 @@ set(LIB
bf_blenlib
PRIVATE bf::dna
bf_editor_screen
PRIVATE bf::intern::guardedalloc
extern_fmtlib
)

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

@ -15,7 +15,6 @@ set(INC
../../sequencer
../../windowmanager
../../../../intern/clog
../../../../intern/guardedalloc
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
@ -113,6 +112,7 @@ set(LIB
bf_blenlib
PRIVATE bf::dna
bf_editor_undo
PRIVATE bf::intern::guardedalloc
)

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

@ -11,7 +11,6 @@ set(INC
../../gpu
../../makesrna
../../windowmanager
../../../../intern/guardedalloc
)
@ -28,6 +27,7 @@ set(SRC
set(LIB
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
)
if(WITH_PYTHON)

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

@ -16,7 +16,6 @@ set(INC
../../makesrna
../../sequencer
../../windowmanager
../../../../intern/guardedalloc
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
@ -54,6 +53,7 @@ set(LIB
bf_editor_interface
bf_editor_util
PRIVATE bf::intern::atomic
PRIVATE bf::intern::guardedalloc
)
if(WITH_AUDASPACE)

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

@ -16,7 +16,6 @@ set(INC
../../makesrna
../../nodes
../../windowmanager
../../../../intern/guardedalloc
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
@ -54,6 +53,7 @@ set(SRC
set(LIB
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
)
if(WITH_OPENVDB)

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

@ -11,7 +11,6 @@ set(INC
../../gpu
../../makesrna
../../windowmanager
../../../../intern/guardedalloc
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
@ -28,6 +27,7 @@ set(LIB
bf_blenkernel
bf_blenlib
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
)

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

@ -12,7 +12,6 @@ set(INC
../../gpu
../../makesrna
../../windowmanager
../../../../intern/guardedalloc
)
@ -40,6 +39,7 @@ set(LIB
bf_blenkernel
bf_blenlib
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
)

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

@ -11,7 +11,6 @@ set(INC
../../gpu
../../makesrna
../../windowmanager
../../../../intern/guardedalloc
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
@ -26,6 +25,7 @@ set(SRC
set(LIB
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
)

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

@ -9,7 +9,6 @@ set(INC
../../blenloader
../../makesrna
../../windowmanager
../../../../intern/guardedalloc
)
@ -26,6 +25,7 @@ set(SRC
set(LIB
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
)
blender_add_lib(bf_editor_space_userpref "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

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

@ -18,7 +18,6 @@ set(INC
../../makesrna
../../render
../../windowmanager
../../../../intern/guardedalloc
../../../../intern/mantaflow/extern
# RNA_prototypes.h
@ -77,6 +76,7 @@ set(LIB
bf_editor_curves
bf_editor_lattice
bf_editor_mesh
PRIVATE bf::intern::guardedalloc
)
if(WITH_PYTHON)

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

@ -16,7 +16,6 @@ set(INC
../../render
../../sequencer
../../windowmanager
../../../../intern/guardedalloc
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
)
@ -124,6 +123,7 @@ set(LIB
PRIVATE bf::dna
bf_editor_mask
bf_gpu
PRIVATE bf::intern::guardedalloc
)

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

@ -12,7 +12,6 @@ set(INC
../../makesrna
../../windowmanager
../../../../intern/clog
../../../../intern/guardedalloc
../../bmesh
)
@ -37,6 +36,7 @@ set(LIB
bf_editor_mesh
bf_editor_metaball
bf_editor_physics
PRIVATE bf::intern::guardedalloc
)
blender_add_lib(bf_editor_undo "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

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

@ -18,7 +18,6 @@ set(INC
../../sequencer
../../windowmanager
../../../../intern/clog
../../../../intern/guardedalloc
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
)
@ -110,6 +109,7 @@ set(SRC
set(LIB
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
)

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

@ -14,7 +14,6 @@ set(INC
../../makesrna
../../windowmanager
../../../../intern/eigen
../../../../intern/guardedalloc
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
)
@ -42,6 +41,7 @@ set(SRC
set(LIB
bf_bmesh
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
)

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

@ -531,6 +531,7 @@ set(SRC
set(LIB
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
bf_python_mathutils
${PYTHON_LINKFLAGS}
@ -549,7 +550,6 @@ set(INC
../python/intern
../render
../render/intern
../../../intern/guardedalloc
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna

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

@ -5,7 +5,6 @@
set(INC
.
../blenlib
../../../intern/guardedalloc
)
set(INC_SYS
@ -51,6 +50,7 @@ set(SRC
set(LIB
bf_blenlib
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
)
if(WITH_TBB)

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

@ -10,7 +10,6 @@ set(INC
../functions
../makesrna
../../../intern/eigen
../../../intern/guardedalloc
)
set(SRC
@ -61,6 +60,7 @@ set(LIB
bf_blenkernel
bf_blenlib
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
)
if(WITH_OPENVDB)

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

@ -16,7 +16,6 @@ set(INC
../render
../windowmanager
../../../intern/eigen
../../../intern/guardedalloc
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
@ -91,6 +90,7 @@ endif()
set(LIB
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
)
blender_add_lib(bf_gpencil_modifiers_legacy "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

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

@ -39,7 +39,6 @@ set(INC
../../../intern/clog
../../../intern/ghost
../../../intern/guardedalloc
../../../intern/mantaflow/extern
)
@ -328,6 +327,7 @@ set(LIB
PRIVATE bf::dna
PRIVATE bf::intern::atomic
${Epoxy_LIBRARIES}
PRIVATE bf::intern::guardedalloc
)
# Select Backend source based on availability

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

@ -8,7 +8,6 @@ set(INC
.
../blenkernel
../blenlib
../../../intern/guardedalloc
)
set(INC_SYS
@ -24,6 +23,7 @@ set(SRC
set(LIB
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
)
if(WITH_IK_SOLVER)

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

@ -10,7 +10,6 @@ set(INC
../gpu
../makesrna
../sequencer
../../../intern/guardedalloc
../../../intern/memutil
)
@ -80,7 +79,7 @@ set(LIB
bf_blenloader
PRIVATE bf::dna
bf_imbuf_openimageio
bf_intern_guardedalloc
PRIVATE bf::intern::guardedalloc
bf_intern_memutil
bf_intern_opencolorio

2
source/blender/imbuf/intern/cineon/CMakeLists.txt
View File

@ -8,7 +8,6 @@ set(INC
../..
../../../blenkernel
../../../blenlib
../../../../../intern/guardedalloc
)
set(INC_SYS
@ -30,6 +29,7 @@ set(SRC
set(LIB
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
)
if(WITH_IMAGE_CINEON)

2
source/blender/imbuf/intern/oiio/CMakeLists.txt
View File

@ -8,7 +8,6 @@ set(INC
../..
../../../blenkernel
../../../blenlib
../../../../../intern/guardedalloc
../../../../../intern/utfconv
)
@ -28,6 +27,7 @@ set(LIB
${OPENIMAGEIO_LIBRARIES}
${PUGIXML_LIBRARIES}
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
)
if(WITH_IMAGE_OPENEXR)

2
source/blender/imbuf/intern/openexr/CMakeLists.txt
View File

@ -8,7 +8,6 @@ set(INC
../..
../../../blenkernel
../../../blenlib
../../../../../intern/guardedalloc
../../../../../intern/utfconv
)
@ -23,6 +22,7 @@ set(SRC
set(LIB
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
)
if(WITH_IMAGE_OPENEXR)

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

@ -15,7 +15,6 @@ set(INC
../../makesrna
../../windowmanager
../../../../intern/clog
../../../../intern/guardedalloc
../../../../intern/utfconv
)
@ -93,6 +92,7 @@ set(LIB
bf_blenkernel
bf_blenlib
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
bf_io_common
${ALEMBIC_LIBRARIES}

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

@ -6,7 +6,6 @@ set(INC
.
../../blenlib
../../imbuf
../../../../intern/guardedalloc
)
set(INC_SYS
@ -33,6 +32,7 @@ set(SRC
set(LIB
${JPEG_LIBRARIES}
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
)
blender_add_lib(bf_avi "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

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

@ -29,7 +29,6 @@ set(INC
../../imbuf
../../makesrna
../../windowmanager
../../../../intern/guardedalloc
../../ikplugin
../../../../intern/iksolver/extern
../../bmesh
@ -117,6 +116,7 @@ set(LIB
${PCRE_LIBRARIES}
${XML2_LIBRARIES}
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
)
if(WITH_BUILDINFO)

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

@ -7,7 +7,6 @@ set(INC
../../blenkernel
../../blenlib
../../depsgraph
../../../../intern/guardedalloc
../../makesrna
)
@ -35,6 +34,7 @@ set(LIB
bf_blenkernel
bf_blenlib
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
)
blender_add_lib(bf_io_common "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

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

@ -14,7 +14,6 @@ set(INC
../../makesrna
../../windowmanager
../../../../intern/clog
../../../../intern/guardedalloc
../../../../intern/utfconv
../../../../extern/nanosvg
)
@ -42,6 +41,7 @@ set(LIB
bf_blenkernel
bf_blenlib
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
bf_io_common
)

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

@ -15,7 +15,6 @@ set(INC
../../geometry
../../makesrna
../../windowmanager
../../../../intern/guardedalloc
)
set(INC_SYS
@ -56,6 +55,7 @@ set(SRC
set(LIB
bf_blenkernel
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
bf_io_common
extern_fmtlib
)

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

@ -15,7 +15,6 @@ set(INC
../../makesrna
../../nodes
../../windowmanager
../../../../intern/guardedalloc
)
set(INC_SYS
@ -39,6 +38,7 @@ set(SRC
set(LIB
bf_blenkernel
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
bf_io_common
)

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

@ -56,7 +56,6 @@ set(INC
../../imbuf
../../makesrna
../../windowmanager
../../../../intern/guardedalloc
../../../../intern/utfconv
)
@ -131,6 +130,7 @@ set(LIB
bf_blenlib
PRIVATE bf::dna
bf_imbuf
PRIVATE bf::intern::guardedalloc
bf_io_common
)

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

@ -16,7 +16,6 @@ set(INC
../../makesrna
../../nodes
../../windowmanager
../../../../intern/guardedalloc
)
set(INC_SYS
@ -59,6 +58,7 @@ set(SRC
set(LIB
bf_blenkernel
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
bf_io_common
extern_fmtlib
)

7
source/blender/makesdna/intern/CMakeLists.txt
View File

@ -9,7 +9,6 @@ set(INC
PUBLIC ${CMAKE_CURRENT_BINARY_DIR}
../../blenlib
../../imbuf
../../../../intern/guardedalloc
)
set(INC_SYS
@ -17,6 +16,8 @@ set(INC_SYS
)
set(LIB
PRIVATE bf::intern::atomic
PRIVATE bf::intern::guardedalloc
)
add_definitions(-DWITH_DNA_GHASH)
@ -93,7 +94,7 @@ setup_platform_linker_flags(makesdna)
setup_platform_linker_libs(makesdna)
blender_target_include_dirs(makesdna ${INC})
blender_target_include_dirs_sys(makesdna ${INC_SYS})
target_link_libraries(makesdna PRIVATE bf::intern::atomic)
target_link_libraries(makesdna ${LIB})
if(WIN32 AND NOT UNIX)
if(DEFINED PTHREADS_LIBRARIES)
@ -149,7 +150,6 @@ add_library(bf::dna ALIAS bf_dna)
set(INC
..
../../blenlib
../../../../intern/guardedalloc
)
set(INC_SYS
@ -163,6 +163,7 @@ set(SRC
set(LIB
PRIVATE bf::intern::atomic
PRIVATE bf::intern::guardedalloc
)
blender_add_lib(bf_dna_blenlib "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

3
source/blender/makesrna/intern/CMakeLists.txt
View File

@ -238,7 +238,6 @@ set(INC
../../render
../../../../intern/clog
../../../../intern/cycles/blender
../../../../intern/guardedalloc
../../../../intern/memutil
../../../../intern/mantaflow/extern
@ -430,6 +429,7 @@ blender_target_include_dirs_sys(makesrna ${INC_SYS})
target_link_libraries(makesrna PRIVATE bf_dna)
target_link_libraries(makesrna PRIVATE bf::intern::atomic)
target_link_libraries(makesrna PRIVATE bf::intern::guardedalloc)
target_link_libraries(makesrna PRIVATE bf_dna_blenlib)
if(WIN32 AND NOT UNIX)
@ -482,6 +482,7 @@ set(LIB
bf_editor_sound
bf_editor_transform
bf_editor_undo
PRIVATE bf::intern::guardedalloc
)
blender_add_lib(bf_rna "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

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

@ -20,7 +20,6 @@ set(INC
../render
../windowmanager
../../../intern/eigen
../../../intern/guardedalloc
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
@ -112,6 +111,7 @@ set(LIB
bf_blenkernel
bf_blenlib
PUBLIC bf::dna
PRIVATE bf::intern::guardedalloc
)
if(WITH_ALEMBIC)

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

@ -30,7 +30,6 @@ set(INC
../render
../windowmanager
../../../extern/fmtlib/include
../../../intern/guardedalloc
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
@ -84,6 +83,7 @@ set(LIB
bf_bmesh
PRIVATE bf::dna
bf_functions
PRIVATE bf::intern::guardedalloc
bf_nodes_composite
bf_nodes_function
bf_nodes_geometry

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

@ -20,7 +20,6 @@ set(INC
../../compositor/realtime_compositor
../../compositor/realtime_compositor/algorithms
../../compositor/realtime_compositor/cached_resources
../../../../intern/guardedalloc
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
@ -130,6 +129,7 @@ set(SRC
set(LIB
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
bf_realtime_compositor
)

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

@ -13,7 +13,6 @@ set(INC
../../functions
../../makesrna
../../windowmanager
../../../../intern/guardedalloc
)
set(INC_SYS
@ -49,6 +48,7 @@ set(SRC
set(LIB
PRIVATE bf::dna
bf_functions
PRIVATE bf::intern::guardedalloc
)
blender_add_lib(bf_nodes_function "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

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

@ -20,7 +20,6 @@ set(INC
../../render
../../windowmanager
../../../../extern/fmtlib/include
../../../../intern/guardedalloc
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
)
@ -204,6 +203,7 @@ set(LIB
PRIVATE bf::dna
bf_functions
bf_geometry
PRIVATE bf::intern::guardedalloc
bf_nodes
extern_fmtlib
)

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

@ -17,7 +17,6 @@ set(INC
../../makesrna
../../render
../../windowmanager
../../../../intern/guardedalloc
../../../../intern/sky/include
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
@ -130,6 +129,7 @@ set(SRC
set(LIB
PRIVATE bf::dna
bf_functions
PRIVATE bf::intern::guardedalloc
bf_intern_sky
bf_nodes
)

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

@ -15,7 +15,6 @@ set(INC
../../makesrna
../../render
../../windowmanager
../../../../intern/guardedalloc
../../bmesh
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
@ -61,6 +60,7 @@ set(SRC
set(LIB
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
bf_nodes
)

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

@ -8,7 +8,6 @@ set(INC
../../blenlib
../../bmesh
../../depsgraph
../../../../intern/guardedalloc
)
set(INC_SYS
@ -41,6 +40,7 @@ set(LIB
bf_blenkernel
bf_blenlib
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
bf_python_mathutils
${PYTHON_LINKFLAGS}

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

@ -9,7 +9,6 @@ set(INC
../../gpu
../../makesrna
../../../../intern/clog
../../../../intern/guardedalloc
)
set(INC_SYS
@ -46,6 +45,7 @@ set(LIB
${PYTHON_LINKFLAGS}
${PYTHON_LIBRARIES}
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
)
if(WITH_PYTHON_MODULE)

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

@ -9,7 +9,6 @@ set(INC
../../editors/include
../../gpu
../../imbuf
../../../../intern/guardedalloc
)
set(INC_SYS
@ -63,6 +62,7 @@ set(LIB
${PYTHON_LINKFLAGS}
${PYTHON_LIBRARIES}
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
)
blender_add_lib(bf_python_gpu "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

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

@ -16,7 +16,6 @@ set(INC
../../makesrna
../../windowmanager
../../../../intern/clog
../../../../intern/guardedalloc
../../../../intern/mantaflow/extern
../../../../intern/opencolorio
# RNA_prototypes.h
@ -126,6 +125,7 @@ set(LIB
bf_editor_animation
bf_editor_interface
bf_editor_space_api
PRIVATE bf::intern::guardedalloc
bf_python_gpu
${PYTHON_LINKFLAGS}

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

@ -9,7 +9,6 @@ set(INC
../../bmesh
../../depsgraph
../../imbuf
../../../../intern/guardedalloc
)
set(INC_SYS
@ -46,6 +45,7 @@ set(LIB
bf_blenlib
PRIVATE bf::dna
bf_imbuf
PRIVATE bf::intern::guardedalloc
bf_python_ext
${PYTHON_LINKFLAGS}

Some files were not shown because too many files have changed in this diff Show More