CMake: revert last weeks modernizations

The cleanup of blenkernel last weeks , caused the house of cards to
collapse on  top of bf_gpu's shader_builder, which is off by default
but used on a daily basis by the rendering team.

Given the fixes forward in #110394 ran into a ODR violation in OSL that
was hiding there for years, I don't see another way forward without
impeding the rendering teams productivity for "quite a while" as there
is no guarantee the OSL issue would be the end of it.

the only way forward appears to be back.

this reverts :

19422044edbd8e8d524db3d02768c4a52f5274be
a670b53abe82f7a36d2caa0d8ae2c67c2bc8c39a
0f541db97c47e5fcd1c71160d71642235d9ea743
be516e8c814dbf7bc43ea91c6913be9f7f96e006
3e88a2f44c413fa7f671f638409a975d59f8c1fb
4e64b772f5ed8f352c2744baece802f70e2430e7
9547e7a317d6f86ab8fbfb3d440f127c2ab75df2
07fe6c5a57d7bcf89318204c0319db1f4a2f5cbd

The problematic commit was 07fe6c5a57d7bcf89318204c0319db1f4a2f5cbd
as blenkernel links most of blender, it's a bit of a link order issue
magnet. Given all these commits stack, it's near impossible to revert
just that one without spending a significant amount of time resolving
merge conflicts. 99% of that work was automated, so easier to just
revert all of them, and re-do the work, than it is to deal with the
merge conflicts.

Pull Request: https://projects.blender.org/blender/blender/pulls/110438
This commit is contained in:
Ray molenkamp 2023-07-25 16:43:21 +02:00
parent 9d0907560a
commit 4ea2baf4ae
95 changed files with 470 additions and 410 deletions

@ -3,7 +3,8 @@
# SPDX-License-Identifier: GPL-2.0-or-later
set(INC
PUBLIC .
.
../atomic
)
set(INC_SYS
@ -18,12 +19,9 @@ set(SRC
set(LIB
PRIVATE bf::intern::guardedalloc
PRIVATE bf::intern::atomic
)
blender_add_lib(bf_intern_clog "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
# Disabled for makesdna/makesrna.
target_compile_definitions(bf_intern_clog PRIVATE WITH_CLOG_PTHREADS)
add_definitions(-DWITH_CLOG_PTHREADS)
add_library(bf::intern::clog ALIAS bf_intern_clog)
blender_add_lib(bf_intern_clog "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

@ -6,6 +6,7 @@ set(INC
..
../../mikktspace
../../../source/blender/makesrna
../../../source/blender/blenkernel
../../../source/blender/gpu
../../../source/blender/render
${CMAKE_BINARY_DIR}/source/blender/makesrna/intern
@ -56,7 +57,6 @@ set(SRC
)
set(LIB
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc

@ -4,6 +4,7 @@
set(INC
.
../clog
../../source/blender/imbuf
)
@ -74,7 +75,6 @@ set(LIB
${Epoxy_LIBRARIES}
PRIVATE bf::blenlib
PRIVATE bf::dna
PRIVATE bf::intern::clog
)
if(WITH_OPENGL_BACKEND)

@ -5,6 +5,8 @@
set(INC
.
intern
../blenkernel
../../../intern/clog
)
set(INC_SYS
@ -37,10 +39,9 @@ set(SRC
)
set(LIB
PRIVATE bf::blenkernel
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::dna
PRIVATE bf::intern::clog
PRIVATE bf::intern::guardedalloc
)

@ -3,7 +3,9 @@
# SPDX-License-Identifier: GPL-2.0-or-later
set(INC
PUBLIC .
.
../blenkernel
../blentranslation
../gpu
../imbuf
../makesrna
@ -29,9 +31,7 @@ set(SRC
)
set(LIB
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
PRIVATE bf::dna
bf_gpu
PRIVATE bf::intern::guardedalloc
@ -54,4 +54,3 @@ endif()
blender_add_lib(bf_blenfont "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
add_library(bf::blenfont ALIAS bf_blenfont)

@ -3,9 +3,13 @@
# SPDX-License-Identifier: GPL-2.0-or-later
set(INC
PUBLIC .
.
../asset_system
../blenfont
../blenloader
../blentranslation
../bmesh
../depsgraph
../draw
../functions
../gpencil_modifiers_legacy
@ -22,6 +26,7 @@ set(INC
../../../intern/eigen
../../../intern/ghost
../../../intern/iksolver/extern
../../../intern/clog
../../../intern/libmv
../../../intern/mantaflow/extern
../../../intern/memutil
@ -521,12 +526,12 @@ set(SRC
set(LIB
bf_asset_system
PRIVATE bf::blenfont
bf_blenfont
PRIVATE bf::blenlib
bf_blenloader
PRIVATE bf::blentranslation
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
bf_blentranslation
bf_bmesh
bf_depsgraph
PRIVATE bf::dna
bf_draw
bf_functions
@ -534,7 +539,7 @@ set(LIB
bf_gpu
bf_ikplugin
bf_imbuf
PRIVATE bf::intern::clog
bf_intern_clog
bf_intern_ghost
PRIVATE bf::intern::guardedalloc
bf_intern_libmv # Uses stub when disabled.
@ -807,7 +812,6 @@ endif()
# endif()
blender_add_lib(bf_blenkernel "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
add_library(bf::blenkernel ALIAS bf_blenkernel)
# RNA_prototypes.h
add_dependencies(bf_blenkernel bf_rna)

@ -4,6 +4,10 @@
set(INC
.
../blenfont
../blenkernel
../blentranslation
../depsgraph
../draw
../editors/include
../gpu
@ -12,6 +16,9 @@ set(INC
../nodes
../render
../sequencer
../windowmanager
../../../intern/clog
../bmesh
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
@ -53,16 +60,10 @@ set(SRC
)
set(LIB
PRIVATE bf::blenfont
PRIVATE bf::blenkernel
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::intern::clog
PRIVATE bf::intern::guardedalloc
PRIVATE bf::windowmanager
)
if(WITH_BUILDINFO)

@ -3,7 +3,9 @@
# SPDX-License-Identifier: GPL-2.0-or-later
set(INC
PUBLIC .
.
../blenkernel
../imbuf
../makesrna
../../../intern/locale
)
@ -20,7 +22,7 @@ set(SRC
)
set(LIB
PRIVATE bf::blenkernel
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
@ -47,7 +49,6 @@ if(WIN32 OR APPLE)
endif()
blender_add_lib(bf_blentranslation "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
add_library(bf::blentranslation ALIAS bf_blentranslation)
if(WITH_INTERNATIONAL)
add_subdirectory(msgfmt)

@ -27,6 +27,8 @@
#include "BKE_appdir.h"
#include "IMB_thumbs.h"
#include "DNA_userdef_types.h"
#include "MEM_guardedalloc.h"

@ -3,7 +3,11 @@
# SPDX-License-Identifier: GPL-2.0-or-later
set(INC
PUBLIC .
.
../blenkernel
../blentranslation
../depsgraph
../../../intern/clog
../../../intern/eigen
../../../extern/rangetree
)
@ -162,12 +166,9 @@ set(SRC
)
set(LIB
PRIVATE bf::blenkernel
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::intern::clog
PRIVATE bf::intern::guardedalloc
extern_rangetree
PRIVATE bf::intern::atomic
@ -217,7 +218,6 @@ 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)

@ -10,14 +10,19 @@ if(WITH_COMPOSITOR_CPU)
intern
nodes
operations
../blenkernel
../blentranslation
../depsgraph
../imbuf
../makesrna
../nodes
../windowmanager
../nodes/composite
../nodes/intern
../render
../render/intern
../../../extern/clew/include
../../../intern/clog
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
@ -589,14 +594,10 @@ if(WITH_COMPOSITOR_CPU)
)
set(LIB
PRIVATE bf::blenkernel
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::intern::clog
PRIVATE bf::intern::guardedalloc
PRIVATE bf::windowmanager
extern_clew
PRIVATE bf::intern::atomic
)

@ -6,6 +6,8 @@ set(INC
.
algorithms
cached_resources
../../blenkernel
../../blentranslation
../../draw
../../gpu
../../imbuf
@ -96,7 +98,6 @@ set(SRC
)
set(LIB
PRIVATE bf::blentranslation
PRIVATE bf::dna
bf_gpu
PRIVATE bf::intern::guardedalloc
@ -104,7 +105,7 @@ set(LIB
bf_imbuf
bf_render
PRIVATE bf::blenlib
PRIVATE bf::blenkernel
bf_blenkernel
)
set(GLSL_SRC

@ -3,12 +3,15 @@
# SPDX-License-Identifier: GPL-2.0-or-later
set(INC
PUBLIC .
.
../blenkernel
../bmesh
../draw
../functions
../makesrna
../modifiers
../sequencer
../windowmanager
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
)
@ -148,13 +151,11 @@ set(SRC
)
set(LIB
PRIVATE bf::blenkernel
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::bmesh
PRIVATE bf::dna
PRIVATE bf::intern::atomic
PRIVATE bf::intern::guardedalloc
PRIVATE bf::windowmanager
)
if(WITH_PYTHON)
@ -165,7 +166,6 @@ if(WITH_PYTHON)
endif()
blender_add_lib(bf_depsgraph "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
add_library(bf::depsgraph ALIAS bf_depsgraph)
# RNA_prototypes.h
add_dependencies(bf_depsgraph bf_rna)

@ -6,7 +6,12 @@ set(INC
.
intern
../blenfont
../blenkernel
../blenloader
../blentranslation
../bmesh
../depsgraph
../editors/include
../editors/space_view3d
../functions
@ -20,7 +25,9 @@ set(INC
../compositor/realtime_compositor
../compositor/realtime_compositor/algorithms
../compositor/realtime_compositor/cached_resources
../windowmanager
../../../intern/clog
../../../intern/opensubdiv
)
@ -345,17 +352,12 @@ set(SRC
)
set(LIB
PRIVATE bf::blenfont
PRIVATE bf::blenkernel
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::intern::clog
PRIVATE bf::intern::guardedalloc
bf_realtime_compositor
PRIVATE bf::windowmanager
bf_windowmanager
PRIVATE bf::intern::atomic
)

@ -4,9 +4,14 @@
set(INC
../include
../../blenkernel
../../blentranslation
../../depsgraph
../../gpu
../../makesrna
../../sequencer
../../windowmanager
../../../../intern/clog
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
)
@ -38,14 +43,10 @@ set(SRC
)
set(LIB
PRIVATE bf::blenkernel
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::intern::clog
PRIVATE bf::intern::guardedalloc
PRIVATE bf::windowmanager
)
if(WITH_PYTHON)

@ -5,9 +5,15 @@
set(INC
../include
../../asset_system
../../blenfont
../../blenkernel
../../blenloader
../../blentranslation
../../depsgraph
../../gpu
../../makesrna
../../windowmanager
../../../../intern/clog
../../../../intern/eigen
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
@ -40,15 +46,10 @@ set(SRC
)
set(LIB
PRIVATE bf::blenfont
PRIVATE bf::blenkernel
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::intern::clog
PRIVATE bf::intern::guardedalloc
PRIVATE bf::windowmanager
)

@ -6,8 +6,12 @@ set(INC
.
../include
../../asset_system
../../blenkernel
../../blenloader
../../blentranslation
../../makesrna
../../windowmanager
../../../../intern/clog
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
)
@ -45,14 +49,11 @@ set(SRC
)
set(LIB
PRIVATE bf::blenkernel
bf_blenkernel
PRIVATE bf::blenlib
bf_blenloader
PRIVATE bf::blentranslation
PRIVATE bf::dna
PRIVATE bf::intern::clog
PRIVATE bf::intern::guardedalloc
PRIVATE bf::windowmanager
)
blender_add_lib(bf_editor_asset "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

@ -4,8 +4,13 @@
set(INC
../include
../../blenkernel
../../blentranslation
../../depsgraph
../../gpu
../../makesrna
../../windowmanager
../../../../intern/clog
../../../../extern/curve_fit_nd
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
@ -30,14 +35,10 @@ set(SRC
)
set(LIB
PRIVATE bf::blenkernel
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::intern::clog
PRIVATE bf::intern::guardedalloc
PRIVATE bf::windowmanager
extern_curve_fit_nd
)

@ -4,10 +4,16 @@
set(INC
../include
../../blenkernel
../../blentranslation
../../depsgraph
../../functions
../../geometry
../../gpu
../../makesrna
../../windowmanager
../../../../intern/clog
../../bmesh
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
@ -24,15 +30,10 @@ set(SRC
)
set(LIB
PRIVATE bf::blenkernel
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::intern::clog
PRIVATE bf::intern::guardedalloc
PRIVATE bf::windowmanager
)
if(WITH_TBB)

@ -5,9 +5,14 @@
set(INC
../include
../../asset_system
../../blenkernel
../../blentranslation
../../depsgraph
../../functions
../../makesrna
../../nodes
../../windowmanager
../../bmesh
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
@ -25,15 +30,13 @@ set(SRC
)
set(LIB
PRIVATE bf::blenkernel
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
bf_depsgraph
PRIVATE bf::dna
bf_editor_object
PRIVATE bf::intern::guardedalloc
PRIVATE bf::windowmanager
bf_windowmanager
)
blender_add_lib(bf_editor_geometry "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

@ -4,8 +4,14 @@
set(INC
../include
../../blenkernel
../../blentranslation
../../bmesh
../../depsgraph
../../gpu
../../makesrna
../../windowmanager
../../../../intern/clog
../../../../intern/eigen
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
@ -35,15 +41,9 @@ set(SRC
)
set(LIB
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::intern::clog
PRIVATE bf::intern::guardedalloc
PRIVATE bf::windowmanager
)

@ -4,9 +4,15 @@
set(INC
../include
../../blenfont
../../blenkernel
../../blentranslation
../../depsgraph
../../gpu
../../imbuf
../../makesrna
../../windowmanager
../../bmesh
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
)
@ -51,15 +57,10 @@ set(SRC
)
set(LIB
PRIVATE bf::blenfont
PRIVATE bf::blenkernel
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
PRIVATE bf::windowmanager
)
if(WITH_POTRACE)

@ -4,9 +4,13 @@
set(INC
../include
../../blenkernel
../../blentranslation
../../depsgraph
../../gpu
../../imbuf
../../makesrna
../../windowmanager
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
)
@ -24,13 +28,10 @@ set(SRC
)
set(LIB
PRIVATE bf::blenkernel
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
PRIVATE bf::windowmanager
)
blender_add_lib(bf_editor_grease_pencil "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

@ -6,7 +6,11 @@ set(INC
.
../include
../../asset_system
../../blenfont
../../blenkernel
../../blenloader
../../blentranslation
../../depsgraph
../../draw
../../functions
../../gpu
@ -15,8 +19,10 @@ set(INC
../../nodes
../../python
../../render
../../windowmanager
../../../../intern/ghost
../../../../extern/fmtlib/include
../../bmesh
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
)
@ -89,16 +95,11 @@ set(SRC
)
set(LIB
PRIVATE bf::blenfont
PRIVATE bf::blenkernel
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
bf_editor_datafiles
PRIVATE bf::intern::guardedalloc
PRIVATE bf::windowmanager
)
if(WITH_INTERNATIONAL)

@ -4,6 +4,10 @@
set(INC
../include
../../blenkernel
../../blentranslation
../../bmesh
../../depsgraph
../../io/alembic
../../io/collada
../../io/common
@ -13,6 +17,7 @@ set(INC
../../io/usd
../../io/wavefront_obj
../../makesrna
../../windowmanager
)
set(INC_SYS
@ -44,14 +49,10 @@ set(SRC
)
set(LIB
PRIVATE bf::blenkernel
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
PRIVATE bf::windowmanager
)
if(WITH_OPENCOLLADA)

@ -4,8 +4,12 @@
set(INC
../include
../../blenkernel
../../depsgraph
../../makesrna
../../render
../../windowmanager
../../../../intern/clog
)
set(INC_SYS
@ -22,13 +26,9 @@ set(SRC
)
set(LIB
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::intern::clog
PRIVATE bf::intern::guardedalloc
PRIVATE bf::windowmanager
)
blender_add_lib(bf_editor_lattice "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

@ -4,8 +4,11 @@
set(INC
../include
../../blenkernel
../../depsgraph
../../gpu
../../makesrna
../../windowmanager
)
set(INC_SYS
@ -26,12 +29,9 @@ set(SRC
)
set(LIB
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
PRIVATE bf::windowmanager
)

@ -5,6 +5,11 @@
set(INC
../include
../uvedit
../../blenfont
../../blenkernel
../../blentranslation
../../bmesh
../../depsgraph
../../draw
../../functions
../../geometry
@ -12,6 +17,8 @@ set(INC
../../imbuf
../../makesrna
../../render
../../windowmanager
../../../../intern/clog
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
)
@ -54,16 +61,11 @@ set(SRC
)
set(LIB
PRIVATE bf::blenfont
PRIVATE bf::blenkernel
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::intern::clog
PRIVATE bf::intern::guardedalloc
PRIVATE bf::windowmanager
bf_windowmanager
)
if(WITH_FREESTYLE)

@ -4,9 +4,13 @@
set(INC
../include
../../blenkernel
../../depsgraph
../../gpu
../../makesrna
../../render
../../windowmanager
../../../../intern/clog
)
set(INC_SYS
@ -22,13 +26,9 @@ set(SRC
)
set(LIB
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::intern::clog
PRIVATE bf::intern::guardedalloc
PRIVATE bf::windowmanager
)
blender_add_lib(bf_editor_metaball "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

@ -4,6 +4,11 @@
set(INC
../include
../../blenfont
../../blenkernel
../../blentranslation
../../bmesh
../../depsgraph
../../functions
../../gpencil_modifiers_legacy
../../gpu
@ -14,6 +19,8 @@ set(INC
../../python
../../render
../../shader_fx
../../windowmanager
../../../../intern/clog
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
@ -54,19 +61,14 @@ set(SRC
)
set(LIB
PRIVATE bf::blenfont
PRIVATE bf::blenkernel
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
bf_editor_mesh
bf_editor_grease_pencil
PRIVATE bf::intern::clog
PRIVATE bf::intern::guardedalloc
bf_render
PRIVATE bf::windowmanager
bf_windowmanager
)

@ -4,8 +4,13 @@
set(INC
../include
../../blenkernel
../../blentranslation
../../depsgraph
../../gpu
../../makesrna
../../windowmanager
../../../../intern/clog
../../../../intern/mantaflow/extern
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
@ -32,14 +37,10 @@ set(SRC
)
set(LIB
PRIVATE bf::blenkernel
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::intern::clog
PRIVATE bf::intern::guardedalloc
PRIVATE bf::windowmanager
)
if(WITH_MOD_FLUID)

@ -4,7 +4,11 @@
set(INC
../include
../../blenkernel
../../blenloader
../../blentranslation
../../bmesh
../../depsgraph
../../draw
../../gpu
../../imbuf
@ -12,6 +16,7 @@ set(INC
../../nodes
../../render
../../sequencer
../../windowmanager
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
)
@ -29,15 +34,10 @@ set(SRC
)
set(LIB
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
bf_draw
PRIVATE bf::intern::guardedalloc
PRIVATE bf::windowmanager
)
if(WITH_HEADLESS)

@ -4,8 +4,12 @@
set(INC
../include
../../blenkernel
../../blentranslation
../../depsgraph
../../makesrna
../../sequencer
../../windowmanager
)
set(INC_SYS
@ -17,13 +21,10 @@ set(SRC
)
set(LIB
PRIVATE bf::blenkernel
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
PRIVATE bf::windowmanager
)

@ -4,11 +4,17 @@
set(INC
../include
../../blenfont
../../blenkernel
../../blenloader
../../blentranslation
../../bmesh
../../depsgraph
../../gpu
../../imbuf
../../makesrna
../../sequencer
../../windowmanager
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
)
@ -36,17 +42,11 @@ set(SRC
)
set(LIB
PRIVATE bf::blenfont
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
bf_editor_datafiles
bf_editor_space_sequencer
PRIVATE bf::intern::guardedalloc
PRIVATE bf::windowmanager
)

@ -5,6 +5,10 @@
set(INC
../include
../uvedit
../../blenkernel
../../blentranslation
../../bmesh
../../depsgraph
../../draw
../../functions
../../geometry
@ -13,6 +17,8 @@ set(INC
../../makesrna
../../nodes
../../render
../../windowmanager
../../../../intern/clog
../../../../intern/eigen
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
@ -88,16 +94,11 @@ set(SRC
)
set(LIB
PRIVATE bf::blenkernel
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::intern::atomic
PRIVATE bf::intern::clog
PRIVATE bf::intern::guardedalloc
PRIVATE bf::windowmanager
)
if(WITH_TBB)

@ -4,8 +4,11 @@
set(INC
../include
../../blenkernel
../../depsgraph
../../makesrna
../../sequencer
../../windowmanager
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
)
@ -21,12 +24,10 @@ set(SRC
)
set(LIB
PRIVATE bf::blenkernel
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
PRIVATE bf::windowmanager
)
if(WITH_AUDASPACE)

@ -4,10 +4,14 @@
set(INC
../include
../../blenkernel
../../blenloader
../../blentranslation
../../depsgraph
../../gpu
../../makesrna
../../modifiers
../../windowmanager
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
@ -29,13 +33,10 @@ set(SRC
)
set(LIB
PRIVATE bf::blenkernel
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
PRIVATE bf::windowmanager
)

@ -6,8 +6,10 @@ set(INC
../include
../io
../../asset_system
../../blenkernel
../../gpu
../../makesrna
../../windowmanager
)
set(INC_SYS
@ -19,7 +21,6 @@ set(SRC
)
set(LIB
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::dna
bf_editor_geometry
@ -43,7 +44,6 @@ set(LIB
bf_editor_space_userpref
bf_editor_space_view3d
PRIVATE bf::intern::guardedalloc
PRIVATE bf::windowmanager
)
blender_add_lib(bf_editor_space_api "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

@ -4,9 +4,13 @@
set(INC
../include
../../blenkernel
../../blenloader
../../blentranslation
../../gpu
../../makesrna
../../windowmanager
../../bmesh
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
@ -25,13 +29,9 @@ set(SRC
)
set(LIB
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
PRIVATE bf::bmesh
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
PRIVATE bf::windowmanager
)

@ -4,10 +4,15 @@
set(INC
../include
../../blenfont
../../blenkernel
../../blenloader
../../blentranslation
../../depsgraph
../../gpu
../../imbuf
../../makesrna
../../windowmanager
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
@ -42,14 +47,10 @@ set(SRC
)
set(LIB
PRIVATE bf::blenfont
PRIVATE bf::blenkernel
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
PRIVATE bf::windowmanager
)

@ -4,9 +4,12 @@
set(INC
../include
../../blenfont
../../blenkernel
../../blenloader
../../gpu
../../makesrna
../../windowmanager
)
@ -22,12 +25,10 @@ set(SRC
)
set(LIB
PRIVATE bf::blenfont
PRIVATE bf::blenkernel
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
PRIVATE bf::windowmanager
)
if(WITH_PYTHON)

@ -6,11 +6,15 @@ set(INC
../asset
../include
../../asset_system
../../blenfont
../../blenkernel
../../blenloader
../../blentranslation
../../gpu
../../imbuf
../../makesrna
../../render
../../windowmanager
../../../../extern/fmtlib/include
# RNA_prototypes.h
@ -40,13 +44,10 @@ set(SRC
)
set(LIB
PRIVATE bf::blenfont
PRIVATE bf::blenkernel
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
PRIVATE bf::windowmanager
extern_fmtlib
PRIVATE bf::intern::atomic
)

@ -4,9 +4,13 @@
set(INC
../include
../../blenkernel
../../blenloader
../../blentranslation
../../depsgraph
../../gpu
../../makesrna
../../windowmanager
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
@ -30,13 +34,10 @@ set(SRC
)
set(LIB
PRIVATE bf::blenkernel
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
PRIVATE bf::windowmanager
)
if(WITH_AUDASPACE)

@ -4,12 +4,19 @@
set(INC
../include
../../blenfont
../../blenkernel
../../blenloader
../../blentranslation
../../bmesh
../../depsgraph
../../draw
../../gpu
../../imbuf
../../makesrna
../../render
../../windowmanager
../../../../intern/clog
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
@ -31,17 +38,11 @@ set(SRC
)
set(LIB
PRIVATE bf::blenfont
PRIVATE bf::blenkernel
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
bf_editor_uvedit
PRIVATE bf::intern::clog
PRIVATE bf::intern::guardedalloc
PRIVATE bf::windowmanager
)
if(WITH_IMAGE_OPENJPEG)

@ -4,10 +4,16 @@
set(INC
../include
../../blenfont
../../blenkernel
../../blenloader
../../blentranslation
../../bmesh
../../depsgraph
../../gpu
../../imbuf
../../makesrna
../../windowmanager
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
@ -29,15 +35,9 @@ set(SRC
)
set(LIB
PRIVATE bf::blenfont
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
PRIVATE bf::windowmanager
)

@ -4,9 +4,13 @@
set(INC
../include
../../blenkernel
../../blenloader
../../blentranslation
../../depsgraph
../../gpu
../../makesrna
../../windowmanager
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
@ -28,13 +32,10 @@ set(SRC
)
set(LIB
PRIVATE bf::blenkernel
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
PRIVATE bf::windowmanager
)

@ -5,8 +5,12 @@
set(INC
../include
../../asset_system
../../blenfont
../../blenkernel
../../blenloader
../../blentranslation
../../compositor
../../depsgraph
../../draw
../../functions
../../geometry
@ -15,6 +19,7 @@ set(INC
../../makesrna
../../nodes
../../render
../../windowmanager
../../../../extern/fmtlib/include
# RNA_prototypes.h
@ -46,15 +51,11 @@ set(SRC
)
set(LIB
PRIVATE bf::blenfont
PRIVATE bf::blenkernel
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
PRIVATE bf::depsgraph
PRIVATE bf::dna
bf_editor_screen
PRIVATE bf::intern::guardedalloc
PRIVATE bf::windowmanager
extern_fmtlib
)

@ -4,11 +4,16 @@
set(INC
../include
../../blenkernel
../../blenloader
../../blentranslation
../../depsgraph
../../gpu
../../imbuf
../../makesrna
../../sequencer
../../windowmanager
../../../../intern/clog
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
@ -102,15 +107,11 @@ set(SRC
)
set(LIB
PRIVATE bf::blenkernel
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
PRIVATE bf::depsgraph
PRIVATE bf::dna
bf_editor_undo
PRIVATE bf::intern::clog
PRIVATE bf::intern::guardedalloc
PRIVATE bf::windowmanager
)

@ -4,9 +4,12 @@
set(INC
../include
../../blenkernel
../../blenloader
../../blentranslation
../../gpu
../../makesrna
../../windowmanager
)
@ -22,12 +25,9 @@ set(SRC
)
set(LIB
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
PRIVATE bf::windowmanager
)
if(WITH_PYTHON)

@ -4,12 +4,17 @@
set(INC
../include
../../blenfont
../../blenkernel
../../blenloader
../../blentranslation
../../depsgraph
../../draw
../../gpu
../../imbuf
../../makesrna
../../sequencer
../../windowmanager
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
@ -43,17 +48,12 @@ set(SRC
)
set(LIB
PRIVATE bf::blenfont
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
PRIVATE bf::depsgraph
PRIVATE bf::dna
bf_editor_interface
bf_editor_util
PRIVATE bf::intern::atomic
PRIVATE bf::intern::guardedalloc
PRIVATE bf::windowmanager
)
if(WITH_AUDASPACE)

@ -4,11 +4,17 @@
set(INC
../include
../../blenfont
../../blenkernel
../../blenloader
../../blentranslation
../../bmesh
../../depsgraph
../../functions
../../gpu
../../makesrna
../../nodes
../../windowmanager
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
@ -45,15 +51,9 @@ set(SRC
)
set(LIB
PRIVATE bf::blenfont
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
PRIVATE bf::windowmanager
)
if(WITH_OPENVDB)

@ -4,9 +4,12 @@
set(INC
../include
../../blenkernel
../../blenloader
../../blentranslation
../../gpu
../../makesrna
../../windowmanager
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
@ -20,12 +23,10 @@ set(SRC
)
set(LIB
PRIVATE bf::blenkernel
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
PRIVATE bf::windowmanager
)

@ -4,9 +4,13 @@
set(INC
../include
../../blenfont
../../blenkernel
../../blenloader
../../blentranslation
../../gpu
../../makesrna
../../windowmanager
)
@ -31,13 +35,10 @@ set(SRC
)
set(LIB
PRIVATE bf::blenfont
PRIVATE bf::blenkernel
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
PRIVATE bf::windowmanager
)

@ -4,9 +4,12 @@
set(INC
../include
../../blenkernel
../../blenloader
../../blentranslation
../../gpu
../../makesrna
../../windowmanager
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
@ -20,12 +23,9 @@ set(SRC
)
set(LIB
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
PRIVATE bf::windowmanager
)

@ -4,8 +4,10 @@
set(INC
../include
../../blenkernel
../../blenloader
../../makesrna
../../windowmanager
)
@ -21,11 +23,9 @@ set(SRC
)
set(LIB
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
PRIVATE bf::windowmanager
)
blender_add_lib(bf_editor_space_userpref "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

@ -5,12 +5,18 @@
set(INC
../include
../../asset_system
../../blenfont
../../blenkernel
../../blenloader
../../blentranslation
../../bmesh
../../depsgraph
../../draw
../../gpu
../../imbuf
../../makesrna
../../render
../../windowmanager
../../../../intern/mantaflow/extern
# RNA_prototypes.h
@ -72,18 +78,12 @@ set(SRC
)
set(LIB
PRIVATE bf::blenfont
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
bf_editor_curves
bf_editor_lattice
bf_editor_mesh
PRIVATE bf::intern::guardedalloc
PRIVATE bf::windowmanager
)
if(WITH_PYTHON)

@ -4,11 +4,17 @@
set(INC
../include
../../blenfont
../../blenkernel
../../blentranslation
../../bmesh
../../depsgraph
../../gpu
../../ikplugin
../../makesrna
../../render
../../sequencer
../../windowmanager
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
)
@ -109,17 +115,14 @@ set(SRC
)
set(LIB
PRIVATE bf::blenfont
PRIVATE bf::blenkernel
bf_blenfont
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
bf_bmesh
PRIVATE bf::dna
bf_editor_mask
bf_gpu
PRIVATE bf::intern::guardedalloc
PRIVATE bf::windowmanager
)

@ -5,8 +5,13 @@
set(INC
../include
../../asset_system
../../blenkernel
../../blenloader
../../blentranslation
../../makesrna
../../windowmanager
../../../../intern/clog
../../bmesh
)
set(INC_SYS
@ -21,10 +26,8 @@ set(SRC
)
set(LIB
PRIVATE bf::blenkernel
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
PRIVATE bf::bmesh
PRIVATE bf::dna
bf_editor_curve
bf_editor_curves
@ -32,9 +35,7 @@ set(LIB
bf_editor_mesh
bf_editor_metaball
bf_editor_physics
PRIVATE bf::intern::clog
PRIVATE bf::intern::guardedalloc
PRIVATE bf::windowmanager
)
blender_add_lib(bf_editor_undo "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

@ -6,10 +6,17 @@ set(INC
../include
../space_sequencer
../../asset_system
../../blenfont
../../blenkernel
../../blentranslation
../../bmesh
../../depsgraph
../../gpu
../../imbuf
../../makesrna
../../sequencer
../../windowmanager
../../../../intern/clog
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
)
@ -100,16 +107,9 @@ set(SRC
)
set(LIB
PRIVATE bf::blenfont
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::intern::clog
PRIVATE bf::intern::guardedalloc
PRIVATE bf::windowmanager
)

@ -4,9 +4,14 @@
set(INC
../include
../../blenkernel
../../blentranslation
../../bmesh
../../depsgraph
../../geometry
../../gpu
../../makesrna
../../windowmanager
../../../../intern/eigen
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
@ -33,14 +38,10 @@ set(SRC
)
set(LIB
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
bf_bmesh
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
PRIVATE bf::windowmanager
)

@ -530,10 +530,7 @@ set(SRC
)
set(LIB
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
bf_python_mathutils
@ -544,6 +541,9 @@ set(LIB
set(INC
.
../blenkernel
../blentranslation
../depsgraph
../imbuf
../makesrna
../python

@ -4,6 +4,8 @@
set(INC
.
../blenkernel
../blentranslation
../functions
../makesrna
../../../intern/eigen
@ -54,9 +56,8 @@ set(SRC
)
set(LIB
PRIVATE bf::blenkernel
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
)

@ -5,9 +5,15 @@
set(INC
.
intern
../blenfont
../blenkernel
../blentranslation
../bmesh
../depsgraph
../editors/include
../makesrna
../render
../windowmanager
../../../intern/eigen
# RNA_prototypes.h
@ -82,15 +88,9 @@ list(APPEND LIB
endif()
set(LIB
PRIVATE bf::blenfont
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
PRIVATE bf::windowmanager
)
blender_add_lib(bf_gpencil_modifiers_legacy "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

@ -8,6 +8,8 @@ set(INC
metal
opengl
vulkan
../blenkernel
../bmesh
../draw
../imbuf
../makesrna
@ -26,6 +28,7 @@ set(INC
# For node muting stuff.
../nodes
../../../intern/clog
../../../intern/ghost
../../../intern/mantaflow/extern
)
@ -312,13 +315,10 @@ set(METAL_SRC
)
set(LIB
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::bmesh
PRIVATE bf::dna
PRIVATE bf::intern::atomic
${Epoxy_LIBRARIES}
PRIVATE bf::intern::clog
PRIVATE bf::intern::guardedalloc
)
@ -819,7 +819,6 @@ if(WITH_GPU_BUILDTIME_SHADER_BUILDER)
bf_intern_ghost
${PLATFORM_LINKLIBS}
PRIVATE bf::intern::guardedalloc
PRIVATE bf::blenkernel
)
target_include_directories(shader_builder PRIVATE ${INC} ${CMAKE_CURRENT_BINARY_DIR})

@ -6,6 +6,7 @@ remove_extra_strict_flags()
set(INC
.
../blenkernel
)
set(INC_SYS
@ -20,7 +21,6 @@ set(SRC
)
set(LIB
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc

@ -4,6 +4,7 @@
set(INC
.
../blenkernel
../blenloader
../gpu
../makesrna
@ -73,7 +74,7 @@ set(SRC
)
set(LIB
PRIVATE bf::blenkernel
bf_blenkernel
PRIVATE bf::blenlib
bf_blenloader
PRIVATE bf::dna

@ -6,6 +6,7 @@ set(INC
.
..
../..
../../../blenkernel
)
set(INC_SYS
@ -26,7 +27,6 @@ set(SRC
)
set(LIB
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc

@ -6,6 +6,7 @@ set(INC
.
..
../..
../../../blenkernel
../../../../../intern/utfconv
)
@ -24,7 +25,6 @@ set(SRC
set(LIB
${OPENIMAGEIO_LIBRARIES}
${PUGIXML_LIBRARIES}
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc

@ -6,6 +6,7 @@ set(INC
.
..
../..
../../../blenkernel
../../../../../intern/utfconv
)
@ -19,7 +20,6 @@ set(SRC
)
set(LIB
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc

@ -5,9 +5,15 @@
set(INC
.
../common
../../blenkernel
../../blenloader
../../blentranslation
../../bmesh
../../depsgraph
../../editors/include
../../makesrna
../../windowmanager
../../../../intern/clog
../../../../intern/utfconv
)
@ -82,19 +88,14 @@ set(SRC
)
set(LIB
PRIVATE bf::blenkernel
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::intern::clog
PRIVATE bf::intern::guardedalloc
bf_io_common
${ALEMBIC_LIBRARIES}
${OPENEXR_LIBRARIES}
PRIVATE bf::windowmanager
)
if(WITH_BOOST)

@ -21,11 +21,16 @@ unset(OPENCOLLADA_ANIMATION_CLIP CACHE)
set(INC
.
../../blenkernel
../../blentranslation
../../depsgraph
../../editors/include
../../imbuf
../../makesrna
../../windowmanager
../../ikplugin
../../../../intern/iksolver/extern
../../bmesh
)
set(INC_SYS
@ -109,14 +114,9 @@ set(LIB
${OPENCOLLADA_LIBRARIES}
${PCRE_LIBRARIES}
${XML2_LIBRARIES}
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
PRIVATE bf::windowmanager
)
if(WITH_BUILDINFO)

@ -4,6 +4,8 @@
set(INC
.
../../blenkernel
../../depsgraph
../../makesrna
)
@ -28,9 +30,8 @@ set(SRC
)
set(LIB
PRIVATE bf::blenkernel
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
)

@ -5,10 +5,15 @@
set(INC
.
../common
../../blenkernel
../../blenloader
../../bmesh
../../depsgraph
../../editors/include
../../makesdna
../../makesrna
../../windowmanager
../../../../intern/clog
../../../../intern/guardedalloc
../../../../intern/utfconv
)
@ -30,16 +35,12 @@ set(SRC
)
set(LIB
PRIVATE bf::blenkernel
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::extern::nanosvg
PRIVATE bf::intern::clog
PRIVATE bf::intern::guardedalloc
bf_io_common
PRIVATE bf::windowmanager
)
if(WITH_PUGIXML)

@ -8,8 +8,12 @@ set(INC
importer
intern
../common
../../blenkernel
../../bmesh
../../depsgraph
../../geometry
../../makesrna
../../windowmanager
)
set(INC_SYS
@ -48,14 +52,11 @@ set(SRC
)
set(LIB
PRIVATE bf::blenkernel
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
bf_io_common
PRIVATE bf::windowmanager
extern_fmtlib
)

@ -6,10 +6,14 @@ set(INC
.
importer
../common
../../blenkernel
../../bmesh
../../bmesh/intern
../../depsgraph
../../editors/include
../../makesrna
../../nodes
../../windowmanager
)
set(INC_SYS
@ -31,14 +35,11 @@ set(SRC
)
set(LIB
PRIVATE bf::blenkernel
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
bf_io_common
PRIVATE bf::windowmanager
)
blender_add_lib(bf_stl "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

@ -46,10 +46,15 @@ endif()
set(INC
.
../common
../../blenkernel
../../blenloader
../../blentranslation
../../bmesh
../../depsgraph
../../editors/include
../../imbuf
../../makesrna
../../windowmanager
../../../../intern/utfconv
)
@ -120,16 +125,12 @@ set(SRC
)
set(LIB
PRIVATE bf::blenkernel
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
bf_imbuf
PRIVATE bf::intern::guardedalloc
bf_io_common
PRIVATE bf::windowmanager
)
list(APPEND LIB

@ -7,10 +7,14 @@ set(INC
exporter
importer
../common
../../blenkernel
../../bmesh
../../bmesh/intern
../../depsgraph
../../editors/include
../../makesrna
../../nodes
../../windowmanager
)
set(INC_SYS
@ -51,14 +55,11 @@ set(SRC
)
set(LIB
PRIVATE bf::blenkernel
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
bf_io_common
PRIVATE bf::windowmanager
extern_fmtlib
)

@ -5,13 +5,19 @@
set(INC
.
intern
../blenfont
../blenkernel
../blenloader
../blentranslation
../bmesh
../depsgraph
../editors/include
../functions
../geometry
../makesrna
../nodes
../render
../windowmanager
../../../intern/eigen
# RNA_prototypes.h
@ -101,15 +107,10 @@ set(SRC
)
set(LIB
PRIVATE bf::blenfont
PRIVATE bf::blenkernel
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PUBLIC bf::dna
PRIVATE bf::intern::guardedalloc
PRIVATE bf::windowmanager
)
if(WITH_ALEMBIC)

@ -17,6 +17,10 @@ set(INC
shader
texture
../editors/include
../blenkernel
../blentranslation
../bmesh
../depsgraph
../functions
../geometry
../gpu
@ -24,6 +28,7 @@ set(INC
../makesrna
../modifiers
../render
../windowmanager
../../../extern/fmtlib/include
# RNA_prototypes.h
@ -75,11 +80,8 @@ set(SRC
)
set(LIB
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
bf_bmesh
PRIVATE bf::dna
bf_functions
PRIVATE bf::intern::guardedalloc
@ -88,7 +90,6 @@ set(LIB
bf_nodes_geometry
bf_nodes_shader
bf_nodes_texture
PRIVATE bf::windowmanager
extern_fmtlib
)

@ -7,11 +7,15 @@ set(INC
..
../intern
../../editors/include
../../blenkernel
../../blentranslation
../../depsgraph
../../functions
../../gpu
../../imbuf
../../makesrna
../../render
../../windowmanager
../../compositor/realtime_compositor
../../compositor/realtime_compositor/algorithms
../../compositor/realtime_compositor/cached_resources
@ -123,14 +127,10 @@ set(SRC
)
set(LIB
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
bf_realtime_compositor
PRIVATE bf::windowmanager
)
if(WITH_IMAGE_OPENEXR)

@ -6,9 +6,12 @@ set(INC
.
..
../intern
../../blenkernel
../../blentranslation
../../editors/include
../../functions
../../makesrna
../../windowmanager
)
set(INC_SYS
@ -42,13 +45,10 @@ set(SRC
)
set(LIB
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
PRIVATE bf::dna
bf_functions
PRIVATE bf::intern::guardedalloc
PRIVATE bf::windowmanager
)
blender_add_lib(bf_nodes_function "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

@ -7,12 +7,17 @@ set(INC
..
../intern
../../editors/include
../../blenkernel
../../blentranslation
../../bmesh
../../depsgraph
../../functions
../../geometry
../../gpu
../../imbuf
../../makesrna
../../render
../../windowmanager
../../../../extern/fmtlib/include
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
@ -195,17 +200,13 @@ set(SRC
)
set(LIB
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
bf_bmesh
PRIVATE bf::dna
bf_functions
bf_geometry
PRIVATE bf::intern::guardedalloc
bf_nodes
PRIVATE bf::windowmanager
extern_fmtlib
)

@ -6,12 +6,16 @@ set(INC
.
..
../intern
../../blenkernel
../../blentranslation
../../depsgraph
../../editors/include
../../functions
../../gpu
../../imbuf
../../makesrna
../../render
../../windowmanager
../../../../intern/sky/include
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
@ -122,16 +126,12 @@ set(SRC
)
set(LIB
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
PRIVATE bf::depsgraph
PRIVATE bf::dna
bf_functions
PRIVATE bf::intern::guardedalloc
bf_intern_sky
bf_nodes
PRIVATE bf::windowmanager
)
if(WITH_FREESTYLE)

@ -7,9 +7,14 @@ set(INC
..
../intern
../../editors/include
../../blenkernel
../../blentranslation
../../depsgraph
../../imbuf
../../makesrna
../../render
../../windowmanager
../../bmesh
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
)
@ -53,15 +58,10 @@ set(SRC
)
set(LIB
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
bf_nodes
PRIVATE bf::windowmanager
)
blender_add_lib(bf_nodes_texture "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

@ -4,6 +4,9 @@
set(INC
.
../../blenkernel
../../bmesh
../../depsgraph
)
set(INC_SYS
@ -33,10 +36,8 @@ set(SRC
)
set(LIB
PRIVATE bf::blenkernel
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
bf_python_mathutils

@ -4,8 +4,10 @@
set(INC
.
../../blenkernel
../../gpu
../../makesrna
../../../../intern/clog
)
set(INC_SYS
@ -41,10 +43,8 @@ set(LIB
${Epoxy_LIBRARIES}
${PYTHON_LINKFLAGS}
${PYTHON_LIBRARIES}
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::dna
PRIVATE bf::intern::clog
PRIVATE bf::intern::guardedalloc
)

@ -4,6 +4,7 @@
set(INC
.
../../blenkernel
../../editors/include
../../gpu
../../imbuf
@ -59,7 +60,6 @@ set(LIB
${Epoxy_LIBRARIES}
${PYTHON_LINKFLAGS}
${PYTHON_LIBRARIES}
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc

@ -4,12 +4,17 @@
set(INC
..
../../blenkernel
../../blenloader
../../blentranslation
../../depsgraph
../../editors/include
../../gpu
../../imbuf
../../imbuf/intern/oiio
../../makesrna
../../windowmanager
../../../../intern/clog
../../../../intern/mantaflow/extern
../../../../intern/opencolorio
# RNA_prototypes.h
@ -115,21 +120,16 @@ set(SRC
)
set(LIB
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
PRIVATE bf::depsgraph
PRIVATE bf::dna
bf_editor_animation
bf_editor_interface
bf_editor_space_api
PRIVATE bf::intern::clog
PRIVATE bf::intern::guardedalloc
bf_python_gpu
${PYTHON_LINKFLAGS}
${PYTHON_LIBRARIES}
PRIVATE bf::windowmanager
)
# only to check if buildinfo is available

@ -4,6 +4,9 @@
set(INC
.
../../blenkernel
../../bmesh
../../depsgraph
../../imbuf
)
@ -38,10 +41,7 @@ set(SRC
)
set(LIB
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
bf_imbuf
PRIVATE bf::intern::guardedalloc

@ -6,8 +6,11 @@
set(INC
.
intern
../blenkernel
../blentranslation
../compositor/realtime_compositor
../compositor/realtime_compositor/cached_resources
../depsgraph
../draw
../gpu
../gpu/intern
@ -16,6 +19,7 @@ set(INC
../nodes
../sequencer
../simulation
../windowmanager
../../../intern/mikktspace
../../../intern/mantaflow/extern
)
@ -54,15 +58,11 @@ set(SRC
)
set(LIB
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
bf_realtime_compositor
PRIVATE bf::intern::atomic
PRIVATE bf::windowmanager
)
if(WITH_PYTHON)

@ -5,10 +5,16 @@
set(INC
.
intern
../blenfont
../blenkernel
../blenloader
../blentranslation
../depsgraph
../imbuf
../makesrna
../render
../windowmanager
../../../intern/clog
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
@ -77,16 +83,11 @@ set(SRC
)
set(LIB
PRIVATE bf::blenfont
PRIVATE bf::blenkernel
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::intern::atomic
PRIVATE bf::intern::clog
PRIVATE bf::intern::guardedalloc
PRIVATE bf::windowmanager
)
if(WITH_AUDASPACE)

@ -5,9 +5,15 @@
set(INC
.
intern
../blenfont
../blenkernel
../blentranslation
../bmesh
../depsgraph
../editors/include
../makesrna
../render
../windowmanager
../../../intern/eigen
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
@ -37,15 +43,9 @@ set(SRC
)
set(LIB
PRIVATE bf::blenfont
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
PRIVATE bf::windowmanager
)

@ -5,6 +5,8 @@
set(INC
.
intern
../blenkernel
../depsgraph
../functions
../imbuf
../makesrna
@ -29,9 +31,8 @@ set(SRC
)
set(LIB
PRIVATE bf::blenkernel
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
)

@ -3,12 +3,16 @@
# SPDX-License-Identifier: GPL-2.0-or-later
set(INC
PUBLIC .
PUBLIC gizmo
PRIVATE gizmo/intern
.
gizmo
gizmo/intern
../asset_system
../blenfont
../blenkernel
../blenloader
../blentranslation
../compositor
../depsgraph
../editors/include
../draw
../gpu
@ -17,8 +21,10 @@ set(INC
../nodes
../render
../sequencer
../../../intern/clog
../../../intern/ghost
../../../intern/memutil
../bmesh
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
@ -91,15 +97,9 @@ set(SRC
)
set(LIB
PRIVATE bf::blenfont
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
bf_editor_screen
PRIVATE bf::intern::clog
PRIVATE bf::intern::guardedalloc
bf_sequencer
)
@ -205,7 +205,6 @@ if(WITH_XR_OPENXR)
endif()
blender_add_lib_nolist(bf_windowmanager "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
add_library(bf::windowmanager ALIAS bf_windowmanager)
# RNA_prototypes.h
add_dependencies(bf_windowmanager bf_rna)

@ -3,23 +3,24 @@
# SPDX-License-Identifier: GPL-2.0-or-later
set(INC
../../intern/clog
../blender/blenkernel
../blender/depsgraph
../blender/editors/include
../blender/gpu
../blender/imbuf
../blender/io/usd
../blender/bmesh
../blender/makesrna
../blender/render
../blender/windowmanager
)
set(LIB
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::intern::clog
PRIVATE bf::intern::guardedalloc
PRIVATE bf::windowmanager
bf_windowmanager
)
if(HAVE_FEENABLEEXCEPT)