From 4ea2baf4ae3b06bba27bee48a26325ac52583efe Mon Sep 17 00:00:00 2001 From: Ray molenkamp Date: Tue, 25 Jul 2023 16:43:21 +0200 Subject: [PATCH] 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 --- intern/clog/CMakeLists.txt | 10 ++++------ intern/cycles/blender/CMakeLists.txt | 2 +- intern/ghost/CMakeLists.txt | 2 +- source/blender/asset_system/CMakeLists.txt | 5 +++-- source/blender/blenfont/CMakeLists.txt | 7 +++---- source/blender/blenkernel/CMakeLists.txt | 18 +++++++++++------- source/blender/blenloader/CMakeLists.txt | 15 ++++++++------- source/blender/blentranslation/CMakeLists.txt | 7 ++++--- .../blentranslation/intern/blt_lang.cc | 2 ++ source/blender/bmesh/CMakeLists.txt | 12 ++++++------ source/blender/compositor/CMakeLists.txt | 11 ++++++----- .../realtime_compositor/CMakeLists.txt | 5 +++-- source/blender/depsgraph/CMakeLists.txt | 10 +++++----- source/blender/draw/CMakeLists.txt | 16 +++++++++------- .../blender/editors/animation/CMakeLists.txt | 11 ++++++----- .../blender/editors/armature/CMakeLists.txt | 13 +++++++------ source/blender/editors/asset/CMakeLists.txt | 9 +++++---- source/blender/editors/curve/CMakeLists.txt | 11 ++++++----- source/blender/editors/curves/CMakeLists.txt | 13 +++++++------ .../blender/editors/geometry/CMakeLists.txt | 13 ++++++++----- .../editors/gizmo_library/CMakeLists.txt | 12 ++++++------ .../editors/gpencil_legacy/CMakeLists.txt | 13 +++++++------ .../editors/grease_pencil/CMakeLists.txt | 9 +++++---- .../blender/editors/interface/CMakeLists.txt | 13 +++++++------ source/blender/editors/io/CMakeLists.txt | 11 ++++++----- source/blender/editors/lattice/CMakeLists.txt | 8 ++++---- source/blender/editors/mask/CMakeLists.txt | 6 +++--- source/blender/editors/mesh/CMakeLists.txt | 16 +++++++++------- .../blender/editors/metaball/CMakeLists.txt | 8 ++++---- source/blender/editors/object/CMakeLists.txt | 16 +++++++++------- source/blender/editors/physics/CMakeLists.txt | 11 ++++++----- source/blender/editors/render/CMakeLists.txt | 10 +++++----- source/blender/editors/scene/CMakeLists.txt | 9 +++++---- source/blender/editors/screen/CMakeLists.txt | 12 ++++++------ .../editors/sculpt_paint/CMakeLists.txt | 13 +++++++------ source/blender/editors/sound/CMakeLists.txt | 7 ++++--- .../editors/space_action/CMakeLists.txt | 9 +++++---- .../blender/editors/space_api/CMakeLists.txt | 4 ++-- .../editors/space_buttons/CMakeLists.txt | 8 ++++---- .../blender/editors/space_clip/CMakeLists.txt | 11 ++++++----- .../editors/space_console/CMakeLists.txt | 7 ++++--- .../blender/editors/space_file/CMakeLists.txt | 9 +++++---- .../editors/space_graph/CMakeLists.txt | 9 +++++---- .../editors/space_image/CMakeLists.txt | 15 ++++++++------- .../blender/editors/space_info/CMakeLists.txt | 12 ++++++------ .../blender/editors/space_nla/CMakeLists.txt | 9 +++++---- .../blender/editors/space_node/CMakeLists.txt | 11 ++++++----- .../editors/space_outliner/CMakeLists.txt | 11 ++++++----- .../editors/space_script/CMakeLists.txt | 6 +++--- .../editors/space_sequencer/CMakeLists.txt | 10 +++++----- .../editors/space_spreadsheet/CMakeLists.txt | 12 ++++++------ .../editors/space_statusbar/CMakeLists.txt | 7 ++++--- .../blender/editors/space_text/CMakeLists.txt | 9 +++++---- .../editors/space_topbar/CMakeLists.txt | 6 +++--- .../editors/space_userpref/CMakeLists.txt | 4 ++-- .../editors/space_view3d/CMakeLists.txt | 12 ++++++------ .../blender/editors/transform/CMakeLists.txt | 15 +++++++++------ source/blender/editors/undo/CMakeLists.txt | 11 ++++++----- source/blender/editors/util/CMakeLists.txt | 14 +++++++------- source/blender/editors/uvedit/CMakeLists.txt | 11 ++++++----- source/blender/freestyle/CMakeLists.txt | 6 +++--- source/blender/geometry/CMakeLists.txt | 5 +++-- .../gpencil_modifiers_legacy/CMakeLists.txt | 12 ++++++------ source/blender/gpu/CMakeLists.txt | 7 +++---- source/blender/ikplugin/CMakeLists.txt | 2 +- source/blender/imbuf/CMakeLists.txt | 3 ++- .../imbuf/intern/cineon/CMakeLists.txt | 2 +- .../blender/imbuf/intern/oiio/CMakeLists.txt | 2 +- .../imbuf/intern/openexr/CMakeLists.txt | 2 +- source/blender/io/alembic/CMakeLists.txt | 13 +++++++------ source/blender/io/collada/CMakeLists.txt | 10 +++++----- source/blender/io/common/CMakeLists.txt | 5 +++-- source/blender/io/gpencil/CMakeLists.txt | 11 ++++++----- source/blender/io/ply/CMakeLists.txt | 9 +++++---- source/blender/io/stl/CMakeLists.txt | 9 +++++---- source/blender/io/usd/CMakeLists.txt | 11 ++++++----- .../blender/io/wavefront_obj/CMakeLists.txt | 9 +++++---- source/blender/modifiers/CMakeLists.txt | 13 +++++++------ source/blender/nodes/CMakeLists.txt | 11 ++++++----- source/blender/nodes/composite/CMakeLists.txt | 8 ++++---- source/blender/nodes/function/CMakeLists.txt | 6 +++--- source/blender/nodes/geometry/CMakeLists.txt | 11 ++++++----- source/blender/nodes/shader/CMakeLists.txt | 8 ++++---- source/blender/nodes/texture/CMakeLists.txt | 10 +++++----- source/blender/python/bmesh/CMakeLists.txt | 7 ++++--- source/blender/python/generic/CMakeLists.txt | 4 ++-- source/blender/python/gpu/CMakeLists.txt | 2 +- source/blender/python/intern/CMakeLists.txt | 10 +++++----- .../blender/python/mathutils/CMakeLists.txt | 6 +++--- source/blender/render/CMakeLists.txt | 8 ++++---- source/blender/sequencer/CMakeLists.txt | 13 +++++++------ source/blender/shader_fx/CMakeLists.txt | 12 ++++++------ source/blender/simulation/CMakeLists.txt | 5 +++-- source/blender/windowmanager/CMakeLists.txt | 19 +++++++++---------- source/creator/CMakeLists.txt | 11 ++++++----- 95 files changed, 470 insertions(+), 410 deletions(-) diff --git a/intern/clog/CMakeLists.txt b/intern/clog/CMakeLists.txt index 03d262761eb..c379f122938 100644 --- a/intern/clog/CMakeLists.txt +++ b/intern/clog/CMakeLists.txt @@ -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}") diff --git a/intern/cycles/blender/CMakeLists.txt b/intern/cycles/blender/CMakeLists.txt index 93b1ec2cec8..dcc960bef4b 100644 --- a/intern/cycles/blender/CMakeLists.txt +++ b/intern/cycles/blender/CMakeLists.txt @@ -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 diff --git a/intern/ghost/CMakeLists.txt b/intern/ghost/CMakeLists.txt index c1886d2aa52..ae9e9d2d021 100644 --- a/intern/ghost/CMakeLists.txt +++ b/intern/ghost/CMakeLists.txt @@ -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) diff --git a/source/blender/asset_system/CMakeLists.txt b/source/blender/asset_system/CMakeLists.txt index 6081e7d4015..65b8cf6026d 100644 --- a/source/blender/asset_system/CMakeLists.txt +++ b/source/blender/asset_system/CMakeLists.txt @@ -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 ) diff --git a/source/blender/blenfont/CMakeLists.txt b/source/blender/blenfont/CMakeLists.txt index 1a92ecf4d99..a7149c9d605 100644 --- a/source/blender/blenfont/CMakeLists.txt +++ b/source/blender/blenfont/CMakeLists.txt @@ -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) diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt index 1f4fd3140cd..47307b5b7e6 100644 --- a/source/blender/blenkernel/CMakeLists.txt +++ b/source/blender/blenkernel/CMakeLists.txt @@ -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) diff --git a/source/blender/blenloader/CMakeLists.txt b/source/blender/blenloader/CMakeLists.txt index 1f2b95b711b..dcc3e79126f 100644 --- a/source/blender/blenloader/CMakeLists.txt +++ b/source/blender/blenloader/CMakeLists.txt @@ -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) diff --git a/source/blender/blentranslation/CMakeLists.txt b/source/blender/blentranslation/CMakeLists.txt index 77d05ea92a6..f8de897ca5a 100644 --- a/source/blender/blentranslation/CMakeLists.txt +++ b/source/blender/blentranslation/CMakeLists.txt @@ -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) diff --git a/source/blender/blentranslation/intern/blt_lang.cc b/source/blender/blentranslation/intern/blt_lang.cc index c79fd393933..fb116ed3429 100644 --- a/source/blender/blentranslation/intern/blt_lang.cc +++ b/source/blender/blentranslation/intern/blt_lang.cc @@ -27,6 +27,8 @@ #include "BKE_appdir.h" +#include "IMB_thumbs.h" + #include "DNA_userdef_types.h" #include "MEM_guardedalloc.h" diff --git a/source/blender/bmesh/CMakeLists.txt b/source/blender/bmesh/CMakeLists.txt index 2f8b0dd0d3b..fb6bcfdcf0f 100644 --- a/source/blender/bmesh/CMakeLists.txt +++ b/source/blender/bmesh/CMakeLists.txt @@ -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) diff --git a/source/blender/compositor/CMakeLists.txt b/source/blender/compositor/CMakeLists.txt index 972d8697024..1e31154e3fd 100644 --- a/source/blender/compositor/CMakeLists.txt +++ b/source/blender/compositor/CMakeLists.txt @@ -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 ) diff --git a/source/blender/compositor/realtime_compositor/CMakeLists.txt b/source/blender/compositor/realtime_compositor/CMakeLists.txt index 543dd5a7095..2b17e0c6ef9 100644 --- a/source/blender/compositor/realtime_compositor/CMakeLists.txt +++ b/source/blender/compositor/realtime_compositor/CMakeLists.txt @@ -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 diff --git a/source/blender/depsgraph/CMakeLists.txt b/source/blender/depsgraph/CMakeLists.txt index 7b6c184b58b..a38adc98189 100644 --- a/source/blender/depsgraph/CMakeLists.txt +++ b/source/blender/depsgraph/CMakeLists.txt @@ -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) diff --git a/source/blender/draw/CMakeLists.txt b/source/blender/draw/CMakeLists.txt index f5f9e659df8..cc5647fa219 100644 --- a/source/blender/draw/CMakeLists.txt +++ b/source/blender/draw/CMakeLists.txt @@ -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 ) diff --git a/source/blender/editors/animation/CMakeLists.txt b/source/blender/editors/animation/CMakeLists.txt index dbfa0debaf2..97c11770259 100644 --- a/source/blender/editors/animation/CMakeLists.txt +++ b/source/blender/editors/animation/CMakeLists.txt @@ -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) diff --git a/source/blender/editors/armature/CMakeLists.txt b/source/blender/editors/armature/CMakeLists.txt index 3064de14c1f..de0f7c627a9 100644 --- a/source/blender/editors/armature/CMakeLists.txt +++ b/source/blender/editors/armature/CMakeLists.txt @@ -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 ) diff --git a/source/blender/editors/asset/CMakeLists.txt b/source/blender/editors/asset/CMakeLists.txt index b329f200dc6..cc6f21e5b15 100644 --- a/source/blender/editors/asset/CMakeLists.txt +++ b/source/blender/editors/asset/CMakeLists.txt @@ -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}") diff --git a/source/blender/editors/curve/CMakeLists.txt b/source/blender/editors/curve/CMakeLists.txt index 76d63729b2f..30c4d5d5821 100644 --- a/source/blender/editors/curve/CMakeLists.txt +++ b/source/blender/editors/curve/CMakeLists.txt @@ -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 ) diff --git a/source/blender/editors/curves/CMakeLists.txt b/source/blender/editors/curves/CMakeLists.txt index f7e4ec4de1a..7b7c7981732 100644 --- a/source/blender/editors/curves/CMakeLists.txt +++ b/source/blender/editors/curves/CMakeLists.txt @@ -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) diff --git a/source/blender/editors/geometry/CMakeLists.txt b/source/blender/editors/geometry/CMakeLists.txt index c780dc4d928..a4e7566d679 100644 --- a/source/blender/editors/geometry/CMakeLists.txt +++ b/source/blender/editors/geometry/CMakeLists.txt @@ -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}") diff --git a/source/blender/editors/gizmo_library/CMakeLists.txt b/source/blender/editors/gizmo_library/CMakeLists.txt index c91baf8895e..bb0fc38f633 100644 --- a/source/blender/editors/gizmo_library/CMakeLists.txt +++ b/source/blender/editors/gizmo_library/CMakeLists.txt @@ -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 ) diff --git a/source/blender/editors/gpencil_legacy/CMakeLists.txt b/source/blender/editors/gpencil_legacy/CMakeLists.txt index 07c959608fb..551c88ce4e6 100644 --- a/source/blender/editors/gpencil_legacy/CMakeLists.txt +++ b/source/blender/editors/gpencil_legacy/CMakeLists.txt @@ -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) diff --git a/source/blender/editors/grease_pencil/CMakeLists.txt b/source/blender/editors/grease_pencil/CMakeLists.txt index c45e81cfc51..97ff1b03197 100644 --- a/source/blender/editors/grease_pencil/CMakeLists.txt +++ b/source/blender/editors/grease_pencil/CMakeLists.txt @@ -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}") diff --git a/source/blender/editors/interface/CMakeLists.txt b/source/blender/editors/interface/CMakeLists.txt index bb3515d4393..d7f08a3472f 100644 --- a/source/blender/editors/interface/CMakeLists.txt +++ b/source/blender/editors/interface/CMakeLists.txt @@ -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) diff --git a/source/blender/editors/io/CMakeLists.txt b/source/blender/editors/io/CMakeLists.txt index df590b5ad46..d50baa77035 100644 --- a/source/blender/editors/io/CMakeLists.txt +++ b/source/blender/editors/io/CMakeLists.txt @@ -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) diff --git a/source/blender/editors/lattice/CMakeLists.txt b/source/blender/editors/lattice/CMakeLists.txt index 5e5ea25a71e..d5d73b4e2cc 100644 --- a/source/blender/editors/lattice/CMakeLists.txt +++ b/source/blender/editors/lattice/CMakeLists.txt @@ -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}") diff --git a/source/blender/editors/mask/CMakeLists.txt b/source/blender/editors/mask/CMakeLists.txt index c6248d5e919..923b0602367 100644 --- a/source/blender/editors/mask/CMakeLists.txt +++ b/source/blender/editors/mask/CMakeLists.txt @@ -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 ) diff --git a/source/blender/editors/mesh/CMakeLists.txt b/source/blender/editors/mesh/CMakeLists.txt index d57459fde24..027ac0d561e 100644 --- a/source/blender/editors/mesh/CMakeLists.txt +++ b/source/blender/editors/mesh/CMakeLists.txt @@ -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) diff --git a/source/blender/editors/metaball/CMakeLists.txt b/source/blender/editors/metaball/CMakeLists.txt index aee08df8a10..c4215e0b4df 100644 --- a/source/blender/editors/metaball/CMakeLists.txt +++ b/source/blender/editors/metaball/CMakeLists.txt @@ -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}") diff --git a/source/blender/editors/object/CMakeLists.txt b/source/blender/editors/object/CMakeLists.txt index 324feb1800b..cc7f19ddda7 100644 --- a/source/blender/editors/object/CMakeLists.txt +++ b/source/blender/editors/object/CMakeLists.txt @@ -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 ) diff --git a/source/blender/editors/physics/CMakeLists.txt b/source/blender/editors/physics/CMakeLists.txt index e4a2fd6b334..34760385f5b 100644 --- a/source/blender/editors/physics/CMakeLists.txt +++ b/source/blender/editors/physics/CMakeLists.txt @@ -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) diff --git a/source/blender/editors/render/CMakeLists.txt b/source/blender/editors/render/CMakeLists.txt index 8ce825c7f71..8eea010f481 100644 --- a/source/blender/editors/render/CMakeLists.txt +++ b/source/blender/editors/render/CMakeLists.txt @@ -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) diff --git a/source/blender/editors/scene/CMakeLists.txt b/source/blender/editors/scene/CMakeLists.txt index 9d0f9b5bfc0..4348c34067a 100644 --- a/source/blender/editors/scene/CMakeLists.txt +++ b/source/blender/editors/scene/CMakeLists.txt @@ -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 ) diff --git a/source/blender/editors/screen/CMakeLists.txt b/source/blender/editors/screen/CMakeLists.txt index ba3dd2dbd8d..29d3c4c77f6 100644 --- a/source/blender/editors/screen/CMakeLists.txt +++ b/source/blender/editors/screen/CMakeLists.txt @@ -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 ) diff --git a/source/blender/editors/sculpt_paint/CMakeLists.txt b/source/blender/editors/sculpt_paint/CMakeLists.txt index ab64ca97134..53e31e9254e 100644 --- a/source/blender/editors/sculpt_paint/CMakeLists.txt +++ b/source/blender/editors/sculpt_paint/CMakeLists.txt @@ -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) diff --git a/source/blender/editors/sound/CMakeLists.txt b/source/blender/editors/sound/CMakeLists.txt index f2c99675f5c..4387a1ff7cc 100644 --- a/source/blender/editors/sound/CMakeLists.txt +++ b/source/blender/editors/sound/CMakeLists.txt @@ -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) diff --git a/source/blender/editors/space_action/CMakeLists.txt b/source/blender/editors/space_action/CMakeLists.txt index c011e2d2884..ede8c745321 100644 --- a/source/blender/editors/space_action/CMakeLists.txt +++ b/source/blender/editors/space_action/CMakeLists.txt @@ -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 ) diff --git a/source/blender/editors/space_api/CMakeLists.txt b/source/blender/editors/space_api/CMakeLists.txt index 8980b1a820e..d97d269a928 100644 --- a/source/blender/editors/space_api/CMakeLists.txt +++ b/source/blender/editors/space_api/CMakeLists.txt @@ -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}") diff --git a/source/blender/editors/space_buttons/CMakeLists.txt b/source/blender/editors/space_buttons/CMakeLists.txt index bdd33e6374e..f276d9cfb2a 100644 --- a/source/blender/editors/space_buttons/CMakeLists.txt +++ b/source/blender/editors/space_buttons/CMakeLists.txt @@ -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 ) diff --git a/source/blender/editors/space_clip/CMakeLists.txt b/source/blender/editors/space_clip/CMakeLists.txt index c6de7cab062..1456f7c6823 100644 --- a/source/blender/editors/space_clip/CMakeLists.txt +++ b/source/blender/editors/space_clip/CMakeLists.txt @@ -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 ) diff --git a/source/blender/editors/space_console/CMakeLists.txt b/source/blender/editors/space_console/CMakeLists.txt index f268d2041bf..caa624c7223 100644 --- a/source/blender/editors/space_console/CMakeLists.txt +++ b/source/blender/editors/space_console/CMakeLists.txt @@ -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) diff --git a/source/blender/editors/space_file/CMakeLists.txt b/source/blender/editors/space_file/CMakeLists.txt index c899a234bcf..7e3ad78c2ad 100644 --- a/source/blender/editors/space_file/CMakeLists.txt +++ b/source/blender/editors/space_file/CMakeLists.txt @@ -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 ) diff --git a/source/blender/editors/space_graph/CMakeLists.txt b/source/blender/editors/space_graph/CMakeLists.txt index 6251c01a0bc..af8324def9b 100644 --- a/source/blender/editors/space_graph/CMakeLists.txt +++ b/source/blender/editors/space_graph/CMakeLists.txt @@ -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) diff --git a/source/blender/editors/space_image/CMakeLists.txt b/source/blender/editors/space_image/CMakeLists.txt index 0619183a205..7b14fdf0e45 100644 --- a/source/blender/editors/space_image/CMakeLists.txt +++ b/source/blender/editors/space_image/CMakeLists.txt @@ -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) diff --git a/source/blender/editors/space_info/CMakeLists.txt b/source/blender/editors/space_info/CMakeLists.txt index 317725a8d74..d491a22017f 100644 --- a/source/blender/editors/space_info/CMakeLists.txt +++ b/source/blender/editors/space_info/CMakeLists.txt @@ -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 ) diff --git a/source/blender/editors/space_nla/CMakeLists.txt b/source/blender/editors/space_nla/CMakeLists.txt index 41c38696174..8a9fbbe3519 100644 --- a/source/blender/editors/space_nla/CMakeLists.txt +++ b/source/blender/editors/space_nla/CMakeLists.txt @@ -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 ) diff --git a/source/blender/editors/space_node/CMakeLists.txt b/source/blender/editors/space_node/CMakeLists.txt index 0d0eb9c1e50..58d5d952c0d 100644 --- a/source/blender/editors/space_node/CMakeLists.txt +++ b/source/blender/editors/space_node/CMakeLists.txt @@ -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 ) diff --git a/source/blender/editors/space_outliner/CMakeLists.txt b/source/blender/editors/space_outliner/CMakeLists.txt index 11bda591967..b91951d434c 100644 --- a/source/blender/editors/space_outliner/CMakeLists.txt +++ b/source/blender/editors/space_outliner/CMakeLists.txt @@ -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 ) diff --git a/source/blender/editors/space_script/CMakeLists.txt b/source/blender/editors/space_script/CMakeLists.txt index eaf61e91e7e..ff14b312a52 100644 --- a/source/blender/editors/space_script/CMakeLists.txt +++ b/source/blender/editors/space_script/CMakeLists.txt @@ -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) diff --git a/source/blender/editors/space_sequencer/CMakeLists.txt b/source/blender/editors/space_sequencer/CMakeLists.txt index 280b8d24d47..5cfce10b200 100644 --- a/source/blender/editors/space_sequencer/CMakeLists.txt +++ b/source/blender/editors/space_sequencer/CMakeLists.txt @@ -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) diff --git a/source/blender/editors/space_spreadsheet/CMakeLists.txt b/source/blender/editors/space_spreadsheet/CMakeLists.txt index d50543d574d..0c042d36e56 100644 --- a/source/blender/editors/space_spreadsheet/CMakeLists.txt +++ b/source/blender/editors/space_spreadsheet/CMakeLists.txt @@ -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) diff --git a/source/blender/editors/space_statusbar/CMakeLists.txt b/source/blender/editors/space_statusbar/CMakeLists.txt index 5d9121a0f5e..2298c838eec 100644 --- a/source/blender/editors/space_statusbar/CMakeLists.txt +++ b/source/blender/editors/space_statusbar/CMakeLists.txt @@ -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 ) diff --git a/source/blender/editors/space_text/CMakeLists.txt b/source/blender/editors/space_text/CMakeLists.txt index 2c03cabd841..a0d9caf978a 100644 --- a/source/blender/editors/space_text/CMakeLists.txt +++ b/source/blender/editors/space_text/CMakeLists.txt @@ -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 ) diff --git a/source/blender/editors/space_topbar/CMakeLists.txt b/source/blender/editors/space_topbar/CMakeLists.txt index 0aee72478f6..e510f6e7931 100644 --- a/source/blender/editors/space_topbar/CMakeLists.txt +++ b/source/blender/editors/space_topbar/CMakeLists.txt @@ -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 ) diff --git a/source/blender/editors/space_userpref/CMakeLists.txt b/source/blender/editors/space_userpref/CMakeLists.txt index 0c6455d8017..44e372aeedf 100644 --- a/source/blender/editors/space_userpref/CMakeLists.txt +++ b/source/blender/editors/space_userpref/CMakeLists.txt @@ -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}") diff --git a/source/blender/editors/space_view3d/CMakeLists.txt b/source/blender/editors/space_view3d/CMakeLists.txt index c60461cf2d3..c12ecdd1602 100644 --- a/source/blender/editors/space_view3d/CMakeLists.txt +++ b/source/blender/editors/space_view3d/CMakeLists.txt @@ -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) diff --git a/source/blender/editors/transform/CMakeLists.txt b/source/blender/editors/transform/CMakeLists.txt index e0555e02b94..42c647328a1 100644 --- a/source/blender/editors/transform/CMakeLists.txt +++ b/source/blender/editors/transform/CMakeLists.txt @@ -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 ) diff --git a/source/blender/editors/undo/CMakeLists.txt b/source/blender/editors/undo/CMakeLists.txt index d4cbd362afb..a34c5f56a19 100644 --- a/source/blender/editors/undo/CMakeLists.txt +++ b/source/blender/editors/undo/CMakeLists.txt @@ -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}") diff --git a/source/blender/editors/util/CMakeLists.txt b/source/blender/editors/util/CMakeLists.txt index 91861ae8403..58b3c891916 100644 --- a/source/blender/editors/util/CMakeLists.txt +++ b/source/blender/editors/util/CMakeLists.txt @@ -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 ) diff --git a/source/blender/editors/uvedit/CMakeLists.txt b/source/blender/editors/uvedit/CMakeLists.txt index 02c46215204..277c9fefb1e 100644 --- a/source/blender/editors/uvedit/CMakeLists.txt +++ b/source/blender/editors/uvedit/CMakeLists.txt @@ -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 ) diff --git a/source/blender/freestyle/CMakeLists.txt b/source/blender/freestyle/CMakeLists.txt index 399726a49b5..a6a381927ee 100644 --- a/source/blender/freestyle/CMakeLists.txt +++ b/source/blender/freestyle/CMakeLists.txt @@ -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 diff --git a/source/blender/geometry/CMakeLists.txt b/source/blender/geometry/CMakeLists.txt index 40d6aa00474..7b2d3614fd8 100644 --- a/source/blender/geometry/CMakeLists.txt +++ b/source/blender/geometry/CMakeLists.txt @@ -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 ) diff --git a/source/blender/gpencil_modifiers_legacy/CMakeLists.txt b/source/blender/gpencil_modifiers_legacy/CMakeLists.txt index 3ba547d6002..4b01735698d 100644 --- a/source/blender/gpencil_modifiers_legacy/CMakeLists.txt +++ b/source/blender/gpencil_modifiers_legacy/CMakeLists.txt @@ -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}") diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt index b6ec95d7663..25e3a0abaee 100644 --- a/source/blender/gpu/CMakeLists.txt +++ b/source/blender/gpu/CMakeLists.txt @@ -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}) diff --git a/source/blender/ikplugin/CMakeLists.txt b/source/blender/ikplugin/CMakeLists.txt index 97b9744b6a0..37cbe43d41a 100644 --- a/source/blender/ikplugin/CMakeLists.txt +++ b/source/blender/ikplugin/CMakeLists.txt @@ -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 diff --git a/source/blender/imbuf/CMakeLists.txt b/source/blender/imbuf/CMakeLists.txt index f20f1a1642b..f0c679547ab 100644 --- a/source/blender/imbuf/CMakeLists.txt +++ b/source/blender/imbuf/CMakeLists.txt @@ -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 diff --git a/source/blender/imbuf/intern/cineon/CMakeLists.txt b/source/blender/imbuf/intern/cineon/CMakeLists.txt index 5200c4cf29b..2f0e0cb5a28 100644 --- a/source/blender/imbuf/intern/cineon/CMakeLists.txt +++ b/source/blender/imbuf/intern/cineon/CMakeLists.txt @@ -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 diff --git a/source/blender/imbuf/intern/oiio/CMakeLists.txt b/source/blender/imbuf/intern/oiio/CMakeLists.txt index 54c9fb6676d..bf1b1a0cef6 100644 --- a/source/blender/imbuf/intern/oiio/CMakeLists.txt +++ b/source/blender/imbuf/intern/oiio/CMakeLists.txt @@ -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 diff --git a/source/blender/imbuf/intern/openexr/CMakeLists.txt b/source/blender/imbuf/intern/openexr/CMakeLists.txt index eeeb283c091..f2bf7ca228e 100644 --- a/source/blender/imbuf/intern/openexr/CMakeLists.txt +++ b/source/blender/imbuf/intern/openexr/CMakeLists.txt @@ -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 diff --git a/source/blender/io/alembic/CMakeLists.txt b/source/blender/io/alembic/CMakeLists.txt index bb3f1c7095d..c160ae3d4ee 100644 --- a/source/blender/io/alembic/CMakeLists.txt +++ b/source/blender/io/alembic/CMakeLists.txt @@ -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) diff --git a/source/blender/io/collada/CMakeLists.txt b/source/blender/io/collada/CMakeLists.txt index b719a2dedf6..fb1c1a7d3a6 100644 --- a/source/blender/io/collada/CMakeLists.txt +++ b/source/blender/io/collada/CMakeLists.txt @@ -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) diff --git a/source/blender/io/common/CMakeLists.txt b/source/blender/io/common/CMakeLists.txt index 7a5dcf26e43..f7e3f465901 100644 --- a/source/blender/io/common/CMakeLists.txt +++ b/source/blender/io/common/CMakeLists.txt @@ -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 ) diff --git a/source/blender/io/gpencil/CMakeLists.txt b/source/blender/io/gpencil/CMakeLists.txt index 856e559a086..f89f875f675 100644 --- a/source/blender/io/gpencil/CMakeLists.txt +++ b/source/blender/io/gpencil/CMakeLists.txt @@ -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) diff --git a/source/blender/io/ply/CMakeLists.txt b/source/blender/io/ply/CMakeLists.txt index 8cca9bc966e..f25dda2aa9f 100644 --- a/source/blender/io/ply/CMakeLists.txt +++ b/source/blender/io/ply/CMakeLists.txt @@ -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 ) diff --git a/source/blender/io/stl/CMakeLists.txt b/source/blender/io/stl/CMakeLists.txt index ec340f56f04..d6c87ce36b8 100644 --- a/source/blender/io/stl/CMakeLists.txt +++ b/source/blender/io/stl/CMakeLists.txt @@ -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}") diff --git a/source/blender/io/usd/CMakeLists.txt b/source/blender/io/usd/CMakeLists.txt index 0c5e0172b93..d028379cff5 100644 --- a/source/blender/io/usd/CMakeLists.txt +++ b/source/blender/io/usd/CMakeLists.txt @@ -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 diff --git a/source/blender/io/wavefront_obj/CMakeLists.txt b/source/blender/io/wavefront_obj/CMakeLists.txt index a475acea87d..40f2f71720f 100644 --- a/source/blender/io/wavefront_obj/CMakeLists.txt +++ b/source/blender/io/wavefront_obj/CMakeLists.txt @@ -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 ) diff --git a/source/blender/modifiers/CMakeLists.txt b/source/blender/modifiers/CMakeLists.txt index 63fc349d638..e6038ce1735 100644 --- a/source/blender/modifiers/CMakeLists.txt +++ b/source/blender/modifiers/CMakeLists.txt @@ -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) diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt index 9daece90d5a..d144ed032e0 100644 --- a/source/blender/nodes/CMakeLists.txt +++ b/source/blender/nodes/CMakeLists.txt @@ -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 ) diff --git a/source/blender/nodes/composite/CMakeLists.txt b/source/blender/nodes/composite/CMakeLists.txt index d062be55983..67ae74420d5 100644 --- a/source/blender/nodes/composite/CMakeLists.txt +++ b/source/blender/nodes/composite/CMakeLists.txt @@ -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) diff --git a/source/blender/nodes/function/CMakeLists.txt b/source/blender/nodes/function/CMakeLists.txt index 8c2d8797edc..1e604277249 100644 --- a/source/blender/nodes/function/CMakeLists.txt +++ b/source/blender/nodes/function/CMakeLists.txt @@ -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}") diff --git a/source/blender/nodes/geometry/CMakeLists.txt b/source/blender/nodes/geometry/CMakeLists.txt index 8f38a2e022e..c89f1312292 100644 --- a/source/blender/nodes/geometry/CMakeLists.txt +++ b/source/blender/nodes/geometry/CMakeLists.txt @@ -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 ) diff --git a/source/blender/nodes/shader/CMakeLists.txt b/source/blender/nodes/shader/CMakeLists.txt index a73b2ce6097..9ce602817b6 100644 --- a/source/blender/nodes/shader/CMakeLists.txt +++ b/source/blender/nodes/shader/CMakeLists.txt @@ -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) diff --git a/source/blender/nodes/texture/CMakeLists.txt b/source/blender/nodes/texture/CMakeLists.txt index 6e9f8680d9c..8f66c258fd1 100644 --- a/source/blender/nodes/texture/CMakeLists.txt +++ b/source/blender/nodes/texture/CMakeLists.txt @@ -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}") diff --git a/source/blender/python/bmesh/CMakeLists.txt b/source/blender/python/bmesh/CMakeLists.txt index 2c5c748eafb..a26c6f79d86 100644 --- a/source/blender/python/bmesh/CMakeLists.txt +++ b/source/blender/python/bmesh/CMakeLists.txt @@ -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 diff --git a/source/blender/python/generic/CMakeLists.txt b/source/blender/python/generic/CMakeLists.txt index b34b0b5ef9b..04ee5deab3a 100644 --- a/source/blender/python/generic/CMakeLists.txt +++ b/source/blender/python/generic/CMakeLists.txt @@ -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 ) diff --git a/source/blender/python/gpu/CMakeLists.txt b/source/blender/python/gpu/CMakeLists.txt index 343707db349..f7cd80c0391 100644 --- a/source/blender/python/gpu/CMakeLists.txt +++ b/source/blender/python/gpu/CMakeLists.txt @@ -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 diff --git a/source/blender/python/intern/CMakeLists.txt b/source/blender/python/intern/CMakeLists.txt index 4fca61dd1e5..5f865430d0b 100644 --- a/source/blender/python/intern/CMakeLists.txt +++ b/source/blender/python/intern/CMakeLists.txt @@ -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 diff --git a/source/blender/python/mathutils/CMakeLists.txt b/source/blender/python/mathutils/CMakeLists.txt index 8a2d32830db..1f0de0d9f05 100644 --- a/source/blender/python/mathutils/CMakeLists.txt +++ b/source/blender/python/mathutils/CMakeLists.txt @@ -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 diff --git a/source/blender/render/CMakeLists.txt b/source/blender/render/CMakeLists.txt index 66a16ffe61f..d8830ad99f3 100644 --- a/source/blender/render/CMakeLists.txt +++ b/source/blender/render/CMakeLists.txt @@ -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) diff --git a/source/blender/sequencer/CMakeLists.txt b/source/blender/sequencer/CMakeLists.txt index c93ee1f3fe9..f5fc6858fda 100644 --- a/source/blender/sequencer/CMakeLists.txt +++ b/source/blender/sequencer/CMakeLists.txt @@ -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) diff --git a/source/blender/shader_fx/CMakeLists.txt b/source/blender/shader_fx/CMakeLists.txt index fe4235abb4f..f480aa36432 100644 --- a/source/blender/shader_fx/CMakeLists.txt +++ b/source/blender/shader_fx/CMakeLists.txt @@ -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 ) diff --git a/source/blender/simulation/CMakeLists.txt b/source/blender/simulation/CMakeLists.txt index 2f46427a167..e14e629ff8d 100644 --- a/source/blender/simulation/CMakeLists.txt +++ b/source/blender/simulation/CMakeLists.txt @@ -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 ) diff --git a/source/blender/windowmanager/CMakeLists.txt b/source/blender/windowmanager/CMakeLists.txt index 1c49021df2b..559ed72d4c2 100644 --- a/source/blender/windowmanager/CMakeLists.txt +++ b/source/blender/windowmanager/CMakeLists.txt @@ -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) diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 8d0361f7586..7f332fd509a 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -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)