From a10ec0bc880cedc2bb5cf8e5dd441bd97f31709e Mon Sep 17 00:00:00 2001 From: Jeroen Bakker Date: Fri, 8 Dec 2023 10:25:21 +0100 Subject: [PATCH] CMake: Revert Until shader_builder Runs Again Due to changes in the build environment shader_builder wasn't able to compile on macOs. With instructions of @LazyDodo we reverted the changes one-by-one until they worked again. This patch reverts `dbb2844ed98f91395856ac3def258f170d78a819`, `94817f64b9780287be94f9c7a46257709622497d` and `1b6cd937ffc8279aadeee2b262690452dea8c7d9`. This PR is not intended to land into main. But as reference what the state is that allows compilation and running of shader builder. --- intern/CMakeLists.txt | 5 ++++- intern/ghost/CMakeLists.txt | 2 +- intern/utfconv/CMakeLists.txt | 12 +++++------- source/blender/blenfont/CMakeLists.txt | 2 +- source/blender/blenkernel/CMakeLists.txt | 6 ++++-- source/blender/blenloader/CMakeLists.txt | 2 +- source/blender/blentranslation/CMakeLists.txt | 2 +- source/blender/compositor/CMakeLists.txt | 2 +- .../compositor/realtime_compositor/CMakeLists.txt | 3 ++- source/blender/depsgraph/CMakeLists.txt | 2 +- source/blender/draw/CMakeLists.txt | 4 ++-- source/blender/editors/curves/CMakeLists.txt | 2 +- source/blender/editors/geometry/CMakeLists.txt | 2 +- source/blender/editors/gpencil_legacy/CMakeLists.txt | 2 +- source/blender/editors/grease_pencil/CMakeLists.txt | 2 +- source/blender/editors/interface/CMakeLists.txt | 4 ++-- source/blender/editors/mesh/CMakeLists.txt | 4 ++-- source/blender/editors/object/CMakeLists.txt | 4 ++-- source/blender/editors/render/CMakeLists.txt | 2 +- source/blender/editors/screen/CMakeLists.txt | 2 +- source/blender/editors/sculpt_paint/CMakeLists.txt | 4 ++-- source/blender/editors/space_clip/CMakeLists.txt | 2 +- source/blender/editors/space_file/CMakeLists.txt | 2 +- source/blender/editors/space_image/CMakeLists.txt | 2 +- source/blender/editors/space_info/CMakeLists.txt | 2 +- source/blender/editors/space_node/CMakeLists.txt | 4 ++-- source/blender/editors/space_outliner/CMakeLists.txt | 2 +- .../blender/editors/space_sequencer/CMakeLists.txt | 2 +- .../blender/editors/space_spreadsheet/CMakeLists.txt | 2 +- source/blender/editors/space_view3d/CMakeLists.txt | 2 +- source/blender/editors/util/CMakeLists.txt | 2 +- source/blender/freestyle/CMakeLists.txt | 2 +- source/blender/functions/CMakeLists.txt | 3 +-- source/blender/geometry/CMakeLists.txt | 2 +- source/blender/gpu/CMakeLists.txt | 3 +-- source/blender/imbuf/CMakeLists.txt | 3 +-- source/blender/imbuf/intern/oiio/CMakeLists.txt | 2 +- source/blender/imbuf/intern/openexr/CMakeLists.txt | 2 +- source/blender/io/alembic/CMakeLists.txt | 2 +- source/blender/io/avi/CMakeLists.txt | 2 +- source/blender/io/collada/CMakeLists.txt | 2 +- source/blender/io/gpencil/CMakeLists.txt | 2 +- source/blender/io/usd/CMakeLists.txt | 5 +++-- source/blender/modifiers/CMakeLists.txt | 2 +- source/blender/nodes/CMakeLists.txt | 5 +++-- source/blender/nodes/composite/CMakeLists.txt | 4 ++-- source/blender/nodes/function/CMakeLists.txt | 3 ++- source/blender/nodes/geometry/CMakeLists.txt | 5 +++-- source/blender/nodes/shader/CMakeLists.txt | 5 +++-- source/blender/nodes/texture/CMakeLists.txt | 2 +- source/blender/python/gpu/CMakeLists.txt | 2 +- source/blender/python/intern/CMakeLists.txt | 2 +- source/blender/python/mathutils/CMakeLists.txt | 3 ++- source/blender/render/CMakeLists.txt | 2 +- source/blender/render/hydra/CMakeLists.txt | 2 +- source/blender/sequencer/CMakeLists.txt | 2 +- source/blender/simulation/CMakeLists.txt | 4 ++-- source/blender/windowmanager/CMakeLists.txt | 2 +- source/creator/CMakeLists.txt | 2 +- 59 files changed, 88 insertions(+), 81 deletions(-) diff --git a/intern/CMakeLists.txt b/intern/CMakeLists.txt index f9814033a97..7b900d3beea 100644 --- a/intern/CMakeLists.txt +++ b/intern/CMakeLists.txt @@ -43,7 +43,10 @@ if(WITH_BULLET) add_subdirectory(rigidbody) endif() -add_subdirectory(utfconv) +# only windows needs utf16 converter +if(WIN32) + add_subdirectory(utfconv) +endif() if(WITH_MOD_FLUID) add_subdirectory(mantaflow) diff --git a/intern/ghost/CMakeLists.txt b/intern/ghost/CMakeLists.txt index 816a428c6b5..296f5b3c5e0 100644 --- a/intern/ghost/CMakeLists.txt +++ b/intern/ghost/CMakeLists.txt @@ -4,6 +4,7 @@ set(INC PUBLIC . + ../../source/blender/imbuf ) set(INC_SYS @@ -71,7 +72,6 @@ set(SRC set(LIB PRIVATE bf::blenlib PRIVATE bf::dna - PRIVATE bf::imbuf PRIVATE bf::intern::clog ) diff --git a/intern/utfconv/CMakeLists.txt b/intern/utfconv/CMakeLists.txt index aadbeb2811c..0f567f13a7c 100644 --- a/intern/utfconv/CMakeLists.txt +++ b/intern/utfconv/CMakeLists.txt @@ -3,7 +3,7 @@ # SPDX-License-Identifier: GPL-2.0-or-later set(INC - PUBLIC . + . ) set(INC_SYS @@ -19,16 +19,14 @@ set(SRC set(LIB ) -# This library is currently windows only, for the other platforms an empty target is created this -# way we don't have to clutter if(WIN32) ... endif() all over the place to use this library. +# This is odd but leave it for now... +# Why have win32 check here? - this is only used for windows. +# ... because one day we might want to use it on other platforms. if(WIN32) list(APPEND SRC utf_winfunc.cc utf_winfunc.hh ) - blender_add_lib(bf_intern_utfconv "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") -else() - add_library(bf_intern_utfconv INTERFACE) endif() -add_library(bf::intern::utfconv ALIAS bf_intern_utfconv) +blender_add_lib(bf_intern_utfconv "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/source/blender/blenfont/CMakeLists.txt b/source/blender/blenfont/CMakeLists.txt index eb548c2522b..ea8c5b856f5 100644 --- a/source/blender/blenfont/CMakeLists.txt +++ b/source/blender/blenfont/CMakeLists.txt @@ -7,6 +7,7 @@ set(INC ../blenkernel ../blentranslation ../gpu + ../imbuf ../makesrna ) @@ -33,7 +34,6 @@ set(LIB PRIVATE bf::blenlib PRIVATE bf::dna bf_gpu - PRIVATE bf::imbuf PRIVATE bf::intern::guardedalloc ${FREETYPE_LIBRARIES} ${BROTLI_LIBRARIES} diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt index 26003e6b1cc..b0cb5521673 100644 --- a/source/blender/blenkernel/CMakeLists.txt +++ b/source/blender/blenkernel/CMakeLists.txt @@ -9,9 +9,11 @@ set(INC ../blentranslation ../bmesh ../draw + ../functions ../gpencil_modifiers_legacy ../gpu ../ikplugin + ../imbuf ../makesrna ../modifiers ../nodes @@ -545,11 +547,11 @@ set(LIB PRIVATE bf::dna bf_draw PRIVATE bf::extern::curve_fit_nd - PRIVATE bf::functions + bf_functions bf_gpencil_modifiers_legacy bf_gpu bf_ikplugin - PRIVATE bf::imbuf + bf_imbuf PRIVATE bf::intern::clog bf_intern_ghost PRIVATE bf::intern::guardedalloc diff --git a/source/blender/blenloader/CMakeLists.txt b/source/blender/blenloader/CMakeLists.txt index 5207f029167..3f1faf7b9c6 100644 --- a/source/blender/blenloader/CMakeLists.txt +++ b/source/blender/blenloader/CMakeLists.txt @@ -9,6 +9,7 @@ set(INC ../draw ../editors/include ../gpu + ../imbuf ../makesrna ../nodes ../render @@ -62,7 +63,6 @@ set(LIB PRIVATE bf::blenlib PRIVATE bf::depsgraph PRIVATE bf::dna - PRIVATE bf::imbuf PRIVATE bf::intern::clog PRIVATE bf::intern::guardedalloc ) diff --git a/source/blender/blentranslation/CMakeLists.txt b/source/blender/blentranslation/CMakeLists.txt index a1d655233d7..841bc181912 100644 --- a/source/blender/blentranslation/CMakeLists.txt +++ b/source/blender/blentranslation/CMakeLists.txt @@ -5,6 +5,7 @@ set(INC . ../blenkernel + ../imbuf ../makesrna ../../../intern/locale ) @@ -24,7 +25,6 @@ set(LIB bf_blenkernel PRIVATE bf::blenlib PRIVATE bf::dna - PRIVATE bf::imbuf PRIVATE bf::intern::guardedalloc ) diff --git a/source/blender/compositor/CMakeLists.txt b/source/blender/compositor/CMakeLists.txt index fe7e71e012f..070b27bb6e1 100644 --- a/source/blender/compositor/CMakeLists.txt +++ b/source/blender/compositor/CMakeLists.txt @@ -12,6 +12,7 @@ if(WITH_COMPOSITOR_CPU) operations ../blenkernel ../blentranslation + ../imbuf ../makesrna ../nodes ../windowmanager @@ -599,7 +600,6 @@ if(WITH_COMPOSITOR_CPU) PRIVATE bf::blenlib PRIVATE bf::depsgraph PRIVATE bf::dna - PRIVATE bf::imbuf PRIVATE bf::intern::clog PRIVATE bf::intern::guardedalloc extern_clew diff --git a/source/blender/compositor/realtime_compositor/CMakeLists.txt b/source/blender/compositor/realtime_compositor/CMakeLists.txt index 83867a99e1f..ed59da9fbb6 100644 --- a/source/blender/compositor/realtime_compositor/CMakeLists.txt +++ b/source/blender/compositor/realtime_compositor/CMakeLists.txt @@ -10,6 +10,7 @@ set(INC ../../blentranslation ../../draw ../../gpu + ../../imbuf ../../makesrna ../../nodes ../../render @@ -111,7 +112,7 @@ set(LIB bf_gpu PRIVATE bf::intern::guardedalloc bf_nodes - PRIVATE bf::imbuf + bf_imbuf bf_render PRIVATE bf::blenlib bf_blenkernel diff --git a/source/blender/depsgraph/CMakeLists.txt b/source/blender/depsgraph/CMakeLists.txt index 06c0270d434..ae5d5d55d8b 100644 --- a/source/blender/depsgraph/CMakeLists.txt +++ b/source/blender/depsgraph/CMakeLists.txt @@ -7,6 +7,7 @@ set(INC ../blenkernel ../bmesh ../draw + ../functions ../makesrna ../modifiers ../sequencer @@ -151,7 +152,6 @@ set(LIB bf_blenkernel PRIVATE bf::blenlib PRIVATE bf::dna - PRIVATE bf::functions PRIVATE bf::intern::atomic PRIVATE bf::intern::guardedalloc ) diff --git a/source/blender/draw/CMakeLists.txt b/source/blender/draw/CMakeLists.txt index 2c960972137..ad9e3ec4bb8 100644 --- a/source/blender/draw/CMakeLists.txt +++ b/source/blender/draw/CMakeLists.txt @@ -12,8 +12,10 @@ set(INC ../bmesh ../editors/include ../editors/space_view3d + ../functions ../gpu ../gpu/intern + ../imbuf ../makesrna ../nodes ../render @@ -350,8 +352,6 @@ set(LIB PRIVATE bf::blenlib PRIVATE bf::depsgraph PRIVATE bf::dna - PRIVATE bf::functions - PRIVATE bf::imbuf PRIVATE bf::intern::clog PRIVATE bf::intern::guardedalloc bf_realtime_compositor diff --git a/source/blender/editors/curves/CMakeLists.txt b/source/blender/editors/curves/CMakeLists.txt index 4a12ceb32b4..e4639aedef1 100644 --- a/source/blender/editors/curves/CMakeLists.txt +++ b/source/blender/editors/curves/CMakeLists.txt @@ -6,6 +6,7 @@ set(INC ../include ../../blenkernel ../../blentranslation + ../../functions ../../geometry ../../gpu ../../makesrna @@ -35,7 +36,6 @@ set(LIB PRIVATE bf::blenlib PRIVATE bf::depsgraph PRIVATE bf::dna - PRIVATE bf::functions PRIVATE bf::intern::clog PRIVATE bf::intern::guardedalloc ) diff --git a/source/blender/editors/geometry/CMakeLists.txt b/source/blender/editors/geometry/CMakeLists.txt index c0f3b6b1d59..f7eafe92c4b 100644 --- a/source/blender/editors/geometry/CMakeLists.txt +++ b/source/blender/editors/geometry/CMakeLists.txt @@ -8,6 +8,7 @@ set(INC ../../blenkernel ../../blentranslation ../../bmesh + ../../functions ../../makesrna ../../nodes ../../windowmanager @@ -34,7 +35,6 @@ set(LIB PRIVATE bf::depsgraph PRIVATE bf::dna bf_editor_object - PRIVATE bf::functions PRIVATE bf::intern::guardedalloc bf_windowmanager ) diff --git a/source/blender/editors/gpencil_legacy/CMakeLists.txt b/source/blender/editors/gpencil_legacy/CMakeLists.txt index 3cad3cae98e..5a1d4e0b605 100644 --- a/source/blender/editors/gpencil_legacy/CMakeLists.txt +++ b/source/blender/editors/gpencil_legacy/CMakeLists.txt @@ -8,6 +8,7 @@ set(INC ../../blentranslation ../../bmesh ../../gpu + ../../imbuf ../../makesrna ../../windowmanager # RNA_prototypes.h @@ -60,7 +61,6 @@ set(LIB PRIVATE bf::blenlib PRIVATE bf::depsgraph PRIVATE bf::dna - PRIVATE bf::imbuf PRIVATE bf::intern::guardedalloc ) diff --git a/source/blender/editors/grease_pencil/CMakeLists.txt b/source/blender/editors/grease_pencil/CMakeLists.txt index affe0af50f5..e9c644863b1 100644 --- a/source/blender/editors/grease_pencil/CMakeLists.txt +++ b/source/blender/editors/grease_pencil/CMakeLists.txt @@ -8,6 +8,7 @@ set(INC ../../blentranslation ../../bmesh ../../gpu + ../../imbuf ../../makesrna ../../windowmanager ../../../../extern/curve_fit_nd @@ -35,7 +36,6 @@ set(LIB PRIVATE bf::blenlib PRIVATE bf::depsgraph PRIVATE bf::dna - PRIVATE bf::imbuf PRIVATE bf::intern::guardedalloc extern_curve_fit_nd ) diff --git a/source/blender/editors/interface/CMakeLists.txt b/source/blender/editors/interface/CMakeLists.txt index ef083529421..3dca992a8ce 100644 --- a/source/blender/editors/interface/CMakeLists.txt +++ b/source/blender/editors/interface/CMakeLists.txt @@ -10,7 +10,9 @@ set(INC ../../blenloader ../../blentranslation ../../draw + ../../functions ../../gpu + ../../imbuf ../../makesrna ../../nodes ../../python @@ -99,8 +101,6 @@ set(LIB PRIVATE bf::depsgraph PRIVATE bf::dna bf_editor_datafiles - PRIVATE bf::functions - PRIVATE bf::imbuf PRIVATE bf::intern::guardedalloc PRIVATE bf::animrig ) diff --git a/source/blender/editors/mesh/CMakeLists.txt b/source/blender/editors/mesh/CMakeLists.txt index 4b9308a2f98..a6e7001299c 100644 --- a/source/blender/editors/mesh/CMakeLists.txt +++ b/source/blender/editors/mesh/CMakeLists.txt @@ -9,8 +9,10 @@ set(INC ../../blentranslation ../../bmesh ../../draw + ../../functions ../../geometry ../../gpu + ../../imbuf ../../makesrna ../../render ../../windowmanager @@ -64,8 +66,6 @@ set(LIB PRIVATE bf::blenlib PRIVATE bf::depsgraph PRIVATE bf::dna - PRIVATE bf::functions - PRIVATE bf::imbuf PRIVATE bf::intern::clog PRIVATE bf::intern::guardedalloc bf_windowmanager diff --git a/source/blender/editors/object/CMakeLists.txt b/source/blender/editors/object/CMakeLists.txt index 05a3a9b480c..69c63252ae8 100644 --- a/source/blender/editors/object/CMakeLists.txt +++ b/source/blender/editors/object/CMakeLists.txt @@ -8,9 +8,11 @@ set(INC ../../blenkernel ../../blentranslation ../../bmesh + ../../functions ../../gpencil_modifiers_legacy ../../gpu ../../ikplugin + ../../imbuf ../../makesrna ../../modifiers ../../python @@ -66,8 +68,6 @@ set(LIB PRIVATE bf::dna bf_editor_mesh bf_editor_grease_pencil - PRIVATE bf::functions - PRIVATE bf::imbuf PRIVATE bf::intern::clog PRIVATE bf::intern::guardedalloc bf_render diff --git a/source/blender/editors/render/CMakeLists.txt b/source/blender/editors/render/CMakeLists.txt index 4e0d88c3814..20eab2ce2ee 100644 --- a/source/blender/editors/render/CMakeLists.txt +++ b/source/blender/editors/render/CMakeLists.txt @@ -10,6 +10,7 @@ set(INC ../../bmesh ../../draw ../../gpu + ../../imbuf ../../makesrna ../../nodes ../../render @@ -39,7 +40,6 @@ set(LIB PRIVATE bf::depsgraph PRIVATE bf::dna bf_draw - PRIVATE bf::imbuf PRIVATE bf::intern::guardedalloc ) diff --git a/source/blender/editors/screen/CMakeLists.txt b/source/blender/editors/screen/CMakeLists.txt index 73678c61cdc..8daaa7e05e4 100644 --- a/source/blender/editors/screen/CMakeLists.txt +++ b/source/blender/editors/screen/CMakeLists.txt @@ -11,6 +11,7 @@ set(INC ../../blentranslation ../../bmesh ../../gpu + ../../imbuf ../../makesrna ../../sequencer ../../windowmanager @@ -48,7 +49,6 @@ set(LIB PRIVATE bf::dna bf_editor_datafiles bf_editor_space_sequencer - PRIVATE bf::imbuf PRIVATE bf::intern::guardedalloc ) diff --git a/source/blender/editors/sculpt_paint/CMakeLists.txt b/source/blender/editors/sculpt_paint/CMakeLists.txt index a59069b2437..56c73553576 100644 --- a/source/blender/editors/sculpt_paint/CMakeLists.txt +++ b/source/blender/editors/sculpt_paint/CMakeLists.txt @@ -9,8 +9,10 @@ set(INC ../../blentranslation ../../bmesh ../../draw + ../../functions ../../geometry ../../gpu + ../../imbuf ../../makesrna ../../nodes ../../render @@ -97,8 +99,6 @@ set(LIB PRIVATE bf::blenlib PRIVATE bf::depsgraph PRIVATE bf::dna - PRIVATE bf::functions - PRIVATE bf::imbuf PRIVATE bf::intern::atomic PRIVATE bf::intern::clog PRIVATE bf::intern::guardedalloc diff --git a/source/blender/editors/space_clip/CMakeLists.txt b/source/blender/editors/space_clip/CMakeLists.txt index d685025a06e..dbd0bb6a993 100644 --- a/source/blender/editors/space_clip/CMakeLists.txt +++ b/source/blender/editors/space_clip/CMakeLists.txt @@ -8,6 +8,7 @@ set(INC ../../blenloader ../../blentranslation ../../gpu + ../../imbuf ../../makesrna ../../windowmanager @@ -49,7 +50,6 @@ set(LIB PRIVATE bf::blenlib PRIVATE bf::depsgraph PRIVATE bf::dna - PRIVATE bf::imbuf PRIVATE bf::intern::guardedalloc ) diff --git a/source/blender/editors/space_file/CMakeLists.txt b/source/blender/editors/space_file/CMakeLists.txt index 8371edaa98e..18dac396a49 100644 --- a/source/blender/editors/space_file/CMakeLists.txt +++ b/source/blender/editors/space_file/CMakeLists.txt @@ -10,6 +10,7 @@ set(INC ../../blenloader ../../blentranslation ../../gpu + ../../imbuf ../../makesrna ../../render ../../windowmanager @@ -48,7 +49,6 @@ set(LIB bf_blenkernel PRIVATE bf::blenlib PRIVATE bf::dna - PRIVATE bf::imbuf PRIVATE bf::intern::guardedalloc extern_fmtlib PRIVATE bf::intern::atomic diff --git a/source/blender/editors/space_image/CMakeLists.txt b/source/blender/editors/space_image/CMakeLists.txt index 5cc9777074c..6e7fc792a20 100644 --- a/source/blender/editors/space_image/CMakeLists.txt +++ b/source/blender/editors/space_image/CMakeLists.txt @@ -10,6 +10,7 @@ set(INC ../../bmesh ../../draw ../../gpu + ../../imbuf ../../makesrna ../../render ../../windowmanager @@ -40,7 +41,6 @@ set(LIB PRIVATE bf::depsgraph PRIVATE bf::dna bf_editor_uvedit - PRIVATE bf::imbuf PRIVATE bf::intern::clog PRIVATE bf::intern::guardedalloc ) diff --git a/source/blender/editors/space_info/CMakeLists.txt b/source/blender/editors/space_info/CMakeLists.txt index 89f5867023d..49df2011f40 100644 --- a/source/blender/editors/space_info/CMakeLists.txt +++ b/source/blender/editors/space_info/CMakeLists.txt @@ -9,6 +9,7 @@ set(INC ../../blentranslation ../../bmesh ../../gpu + ../../imbuf ../../makesrna ../../windowmanager @@ -36,7 +37,6 @@ set(LIB PRIVATE bf::blenlib PRIVATE bf::depsgraph PRIVATE bf::dna - PRIVATE bf::imbuf PRIVATE bf::intern::guardedalloc ) diff --git a/source/blender/editors/space_node/CMakeLists.txt b/source/blender/editors/space_node/CMakeLists.txt index ad17064ec71..f1d25b7e929 100644 --- a/source/blender/editors/space_node/CMakeLists.txt +++ b/source/blender/editors/space_node/CMakeLists.txt @@ -10,8 +10,10 @@ set(INC ../../blentranslation ../../compositor ../../draw + ../../functions ../../geometry ../../gpu + ../../imbuf ../../makesrna ../../nodes ../../render @@ -55,8 +57,6 @@ set(LIB PRIVATE bf::depsgraph PRIVATE bf::dna bf_editor_screen - PRIVATE bf::functions - PRIVATE bf::imbuf PRIVATE bf::intern::guardedalloc extern_fmtlib ) diff --git a/source/blender/editors/space_outliner/CMakeLists.txt b/source/blender/editors/space_outliner/CMakeLists.txt index 42e7c031321..26df8082a1c 100644 --- a/source/blender/editors/space_outliner/CMakeLists.txt +++ b/source/blender/editors/space_outliner/CMakeLists.txt @@ -8,6 +8,7 @@ set(INC ../../blenloader ../../blentranslation ../../gpu + ../../imbuf ../../makesrna ../../sequencer ../../windowmanager @@ -134,7 +135,6 @@ set(LIB PRIVATE bf::depsgraph PRIVATE bf::dna bf_editor_undo - PRIVATE bf::imbuf PRIVATE bf::intern::clog PRIVATE bf::intern::guardedalloc ) diff --git a/source/blender/editors/space_sequencer/CMakeLists.txt b/source/blender/editors/space_sequencer/CMakeLists.txt index 5e31cd1d0ed..e5602bb28b9 100644 --- a/source/blender/editors/space_sequencer/CMakeLists.txt +++ b/source/blender/editors/space_sequencer/CMakeLists.txt @@ -9,6 +9,7 @@ set(INC ../../blentranslation ../../draw ../../gpu + ../../imbuf ../../makesrna ../../sequencer ../../windowmanager @@ -54,7 +55,6 @@ set(LIB PRIVATE bf::dna bf_editor_interface bf_editor_util - PRIVATE bf::imbuf PRIVATE bf::intern::atomic PRIVATE bf::intern::guardedalloc ) diff --git a/source/blender/editors/space_spreadsheet/CMakeLists.txt b/source/blender/editors/space_spreadsheet/CMakeLists.txt index 85e9c7e8976..dba272f8698 100644 --- a/source/blender/editors/space_spreadsheet/CMakeLists.txt +++ b/source/blender/editors/space_spreadsheet/CMakeLists.txt @@ -8,6 +8,7 @@ set(INC ../../blenloader ../../blentranslation ../../bmesh + ../../functions ../../gpu ../../makesrna ../../nodes @@ -52,7 +53,6 @@ set(LIB PRIVATE bf::blenlib PRIVATE bf::depsgraph PRIVATE bf::dna - PRIVATE bf::functions PRIVATE bf::intern::guardedalloc ) diff --git a/source/blender/editors/space_view3d/CMakeLists.txt b/source/blender/editors/space_view3d/CMakeLists.txt index b66a2383aac..52945d2d5c0 100644 --- a/source/blender/editors/space_view3d/CMakeLists.txt +++ b/source/blender/editors/space_view3d/CMakeLists.txt @@ -12,6 +12,7 @@ set(INC ../../bmesh ../../draw ../../gpu + ../../imbuf ../../makesrna ../../render ../../windowmanager @@ -85,7 +86,6 @@ set(LIB bf_editor_curves bf_editor_lattice bf_editor_mesh - PRIVATE bf::imbuf PRIVATE bf::intern::guardedalloc ) diff --git a/source/blender/editors/util/CMakeLists.txt b/source/blender/editors/util/CMakeLists.txt index fef9a241a5b..a43fd1bf0b8 100644 --- a/source/blender/editors/util/CMakeLists.txt +++ b/source/blender/editors/util/CMakeLists.txt @@ -10,6 +10,7 @@ set(INC ../../blentranslation ../../bmesh ../../gpu + ../../imbuf ../../makesrna ../../sequencer ../../windowmanager @@ -111,7 +112,6 @@ set(LIB PRIVATE bf::blenlib PRIVATE bf::depsgraph PRIVATE bf::dna - PRIVATE bf::imbuf PRIVATE bf::intern::clog PRIVATE bf::intern::guardedalloc ) diff --git a/source/blender/freestyle/CMakeLists.txt b/source/blender/freestyle/CMakeLists.txt index 084d79e1065..b2cd7a51347 100644 --- a/source/blender/freestyle/CMakeLists.txt +++ b/source/blender/freestyle/CMakeLists.txt @@ -533,7 +533,6 @@ set(LIB PRIVATE bf::blenlib PRIVATE bf::depsgraph PRIVATE bf::dna - PRIVATE bf::imbuf PRIVATE bf::intern::guardedalloc bf_python_mathutils @@ -545,6 +544,7 @@ set(INC . ../blenkernel ../blentranslation + ../imbuf ../makesrna ../python ../python/intern diff --git a/source/blender/functions/CMakeLists.txt b/source/blender/functions/CMakeLists.txt index 43783df6ab4..6e2f38bd142 100644 --- a/source/blender/functions/CMakeLists.txt +++ b/source/blender/functions/CMakeLists.txt @@ -3,7 +3,7 @@ # SPDX-License-Identifier: GPL-2.0-or-later set(INC - PUBLIC . + . ) set(INC_SYS @@ -65,7 +65,6 @@ if(WITH_TBB) endif() blender_add_lib(bf_functions "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") -add_library(bf::functions ALIAS bf_functions) if(WITH_GTESTS) set(TEST_INC diff --git a/source/blender/geometry/CMakeLists.txt b/source/blender/geometry/CMakeLists.txt index e3485637444..3e1da4cc469 100644 --- a/source/blender/geometry/CMakeLists.txt +++ b/source/blender/geometry/CMakeLists.txt @@ -6,6 +6,7 @@ set(INC . ../blenkernel ../blentranslation + ../functions ../makesrna ../../../intern/eigen ) @@ -73,7 +74,6 @@ set(LIB bf_blenkernel PRIVATE bf::blenlib PRIVATE bf::dna - PRIVATE bf::functions PRIVATE bf::intern::guardedalloc ) diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt index 43d7f4e8eca..692d2708277 100644 --- a/source/blender/gpu/CMakeLists.txt +++ b/source/blender/gpu/CMakeLists.txt @@ -12,6 +12,7 @@ set(INC ../blenkernel ../bmesh ../draw + ../imbuf ../makesrna # For theme color access. @@ -329,7 +330,6 @@ set(METAL_SRC set(LIB PRIVATE bf::blenlib PRIVATE bf::dna - PRIVATE bf::imbuf PRIVATE bf::intern::atomic PRIVATE bf::intern::clog PRIVATE bf::intern::guardedalloc @@ -855,7 +855,6 @@ if(WITH_GPU_BUILDTIME_SHADER_BUILDER) bf_intern_ghost ${PLATFORM_LINKLIBS} PRIVATE bf::intern::guardedalloc - PRIVATE bf::imbuf ) target_include_directories(shader_builder PRIVATE ${INC} ${CMAKE_CURRENT_BINARY_DIR}) diff --git a/source/blender/imbuf/CMakeLists.txt b/source/blender/imbuf/CMakeLists.txt index 7af2e7cdb58..62f9310355a 100644 --- a/source/blender/imbuf/CMakeLists.txt +++ b/source/blender/imbuf/CMakeLists.txt @@ -3,7 +3,7 @@ # SPDX-License-Identifier: GPL-2.0-or-later set(INC - PUBLIC . + . ../blenkernel ../blenloader ../gpu @@ -188,4 +188,3 @@ set_source_files_properties( ) blender_add_lib(bf_imbuf "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") -add_library(bf::imbuf ALIAS bf_imbuf) diff --git a/source/blender/imbuf/intern/oiio/CMakeLists.txt b/source/blender/imbuf/intern/oiio/CMakeLists.txt index e85b83da551..3ed76ccd1ea 100644 --- a/source/blender/imbuf/intern/oiio/CMakeLists.txt +++ b/source/blender/imbuf/intern/oiio/CMakeLists.txt @@ -7,6 +7,7 @@ set(INC .. ../.. ../../../blenkernel + ../../../../../intern/utfconv ) set(INC_SYS @@ -26,7 +27,6 @@ set(LIB PRIVATE bf::blenlib PRIVATE bf::dna PRIVATE bf::intern::guardedalloc - PRIVATE bf::intern::utfconv ) if(WITH_PUGIXML) diff --git a/source/blender/imbuf/intern/openexr/CMakeLists.txt b/source/blender/imbuf/intern/openexr/CMakeLists.txt index a7163d98342..c9a6eb5c732 100644 --- a/source/blender/imbuf/intern/openexr/CMakeLists.txt +++ b/source/blender/imbuf/intern/openexr/CMakeLists.txt @@ -7,6 +7,7 @@ set(INC .. ../.. ../../../blenkernel + ../../../../../intern/utfconv ) set(INC_SYS @@ -22,7 +23,6 @@ set(LIB PRIVATE bf::blenlib PRIVATE bf::dna PRIVATE bf::intern::guardedalloc - PRIVATE bf::intern::utfconv ) if(WITH_IMAGE_OPENEXR) diff --git a/source/blender/io/alembic/CMakeLists.txt b/source/blender/io/alembic/CMakeLists.txt index 574dd0cfda4..9287fc546c9 100644 --- a/source/blender/io/alembic/CMakeLists.txt +++ b/source/blender/io/alembic/CMakeLists.txt @@ -12,6 +12,7 @@ set(INC ../../editors/include ../../makesrna ../../windowmanager + ../../../../intern/utfconv ) set(INC_SYS @@ -91,7 +92,6 @@ set(LIB PRIVATE bf::dna PRIVATE bf::intern::clog PRIVATE bf::intern::guardedalloc - PRIVATE bf::intern::utfconv bf_io_common ${ALEMBIC_LIBRARIES} diff --git a/source/blender/io/avi/CMakeLists.txt b/source/blender/io/avi/CMakeLists.txt index 61f73162b98..a64b9826f2b 100644 --- a/source/blender/io/avi/CMakeLists.txt +++ b/source/blender/io/avi/CMakeLists.txt @@ -4,6 +4,7 @@ set(INC . + ../../imbuf ) set(INC_SYS @@ -31,7 +32,6 @@ set(LIB ${JPEG_LIBRARIES} PRIVATE bf::blenlib PRIVATE bf::dna - PRIVATE bf::imbuf PRIVATE bf::intern::guardedalloc ) diff --git a/source/blender/io/collada/CMakeLists.txt b/source/blender/io/collada/CMakeLists.txt index 9585c915bcd..32c5e0e877d 100644 --- a/source/blender/io/collada/CMakeLists.txt +++ b/source/blender/io/collada/CMakeLists.txt @@ -25,6 +25,7 @@ set(INC ../../blentranslation ../../editors/include ../../ikplugin + ../../imbuf ../../makesrna ../../windowmanager ../../../../intern/iksolver/extern @@ -116,7 +117,6 @@ set(LIB PRIVATE bf::blenlib PRIVATE bf::depsgraph PRIVATE bf::dna - PRIVATE bf::imbuf PRIVATE bf::intern::guardedalloc ) diff --git a/source/blender/io/gpencil/CMakeLists.txt b/source/blender/io/gpencil/CMakeLists.txt index 38ab950fe01..a9bf90a7190 100644 --- a/source/blender/io/gpencil/CMakeLists.txt +++ b/source/blender/io/gpencil/CMakeLists.txt @@ -13,6 +13,7 @@ set(INC ../../makesrna ../../windowmanager ../../../../intern/guardedalloc + ../../../../intern/utfconv ) set(INC_SYS @@ -39,7 +40,6 @@ set(LIB PRIVATE bf::extern::nanosvg PRIVATE bf::intern::clog PRIVATE bf::intern::guardedalloc - PRIVATE bf::intern::utfconv bf_io_common ) diff --git a/source/blender/io/usd/CMakeLists.txt b/source/blender/io/usd/CMakeLists.txt index 1eb854470eb..cc35680b152 100644 --- a/source/blender/io/usd/CMakeLists.txt +++ b/source/blender/io/usd/CMakeLists.txt @@ -62,10 +62,12 @@ set(INC ../../blentranslation ../../bmesh ../../editors/include + ../../imbuf ../../makesrna ../../nodes ../../python/intern ../../windowmanager + ../../../../intern/utfconv # RNA_prototypes.h ${CMAKE_BINARY_DIR}/source/blender/makesrna ) @@ -182,10 +184,9 @@ set(LIB PRIVATE bf::depsgraph PRIVATE bf::dna PRIVATE bf::animrig - PRIVATE bf::imbuf + bf_imbuf PRIVATE bf::intern::clog PRIVATE bf::intern::guardedalloc - PRIVATE bf::intern::utfconv bf_io_common ) diff --git a/source/blender/modifiers/CMakeLists.txt b/source/blender/modifiers/CMakeLists.txt index 33fce46ad89..ef9ff57b606 100644 --- a/source/blender/modifiers/CMakeLists.txt +++ b/source/blender/modifiers/CMakeLists.txt @@ -10,6 +10,7 @@ set(INC ../blentranslation ../bmesh ../editors/include + ../functions ../geometry ../makesrna ../nodes @@ -109,7 +110,6 @@ set(LIB PRIVATE bf::blenlib PRIVATE bf::depsgraph PUBLIC bf::dna - PRIVATE bf::functions PRIVATE bf::intern::guardedalloc ) diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt index 03762743051..21c76090975 100644 --- a/source/blender/nodes/CMakeLists.txt +++ b/source/blender/nodes/CMakeLists.txt @@ -58,8 +58,10 @@ set(INC ../blenloader ../blentranslation ../bmesh + ../functions ../geometry ../gpu + ../imbuf ../makesrna ../modifiers ../render @@ -124,8 +126,7 @@ set(LIB bf_bmesh PRIVATE bf::depsgraph PRIVATE bf::dna - PRIVATE bf::functions - PRIVATE bf::imbuf + bf_functions PRIVATE bf::intern::guardedalloc bf_nodes_composite bf_nodes_function diff --git a/source/blender/nodes/composite/CMakeLists.txt b/source/blender/nodes/composite/CMakeLists.txt index 8616b3e6624..a57e6e7de84 100644 --- a/source/blender/nodes/composite/CMakeLists.txt +++ b/source/blender/nodes/composite/CMakeLists.txt @@ -9,7 +9,9 @@ set(INC ../../editors/include ../../blenkernel ../../blentranslation + ../../functions ../../gpu + ../../imbuf ../../makesrna ../../render ../../windowmanager @@ -127,8 +129,6 @@ set(LIB PRIVATE bf::blenlib PRIVATE bf::depsgraph PRIVATE bf::dna - PRIVATE bf::functions - PRIVATE bf::imbuf PRIVATE bf::intern::guardedalloc bf_realtime_compositor ) diff --git a/source/blender/nodes/function/CMakeLists.txt b/source/blender/nodes/function/CMakeLists.txt index ef9d8ef8aca..4de72835da4 100644 --- a/source/blender/nodes/function/CMakeLists.txt +++ b/source/blender/nodes/function/CMakeLists.txt @@ -9,6 +9,7 @@ set(INC ../../blenkernel ../../blentranslation ../../editors/include + ../../functions ../../makesrna ../../windowmanager ) @@ -52,7 +53,7 @@ set(SRC set(LIB PRIVATE bf::blenlib PRIVATE bf::dna - PRIVATE bf::functions + bf_functions PRIVATE bf::intern::guardedalloc ) diff --git a/source/blender/nodes/geometry/CMakeLists.txt b/source/blender/nodes/geometry/CMakeLists.txt index d2d5cb3595d..259e588c17b 100644 --- a/source/blender/nodes/geometry/CMakeLists.txt +++ b/source/blender/nodes/geometry/CMakeLists.txt @@ -10,8 +10,10 @@ set(INC ../../blenkernel ../../blentranslation ../../bmesh + ../../functions ../../geometry ../../gpu + ../../imbuf ../../makesrna ../../modifiers ../../render @@ -205,9 +207,8 @@ set(LIB bf_bmesh PRIVATE bf::depsgraph PRIVATE bf::dna - PRIVATE bf::functions + bf_functions bf_geometry - PRIVATE bf::imbuf PRIVATE bf::intern::guardedalloc bf_nodes extern_fmtlib diff --git a/source/blender/nodes/shader/CMakeLists.txt b/source/blender/nodes/shader/CMakeLists.txt index cd578b83623..845fe16a420 100644 --- a/source/blender/nodes/shader/CMakeLists.txt +++ b/source/blender/nodes/shader/CMakeLists.txt @@ -9,7 +9,9 @@ set(INC ../../blenkernel ../../blentranslation ../../editors/include + ../../functions ../../gpu + ../../imbuf ../../makesrna ../../render ../../windowmanager @@ -127,8 +129,7 @@ set(LIB PRIVATE bf::blenlib PRIVATE bf::depsgraph PRIVATE bf::dna - PRIVATE bf::functions - PRIVATE bf::imbuf + bf_functions PRIVATE bf::intern::clog PRIVATE bf::intern::guardedalloc bf_intern_sky diff --git a/source/blender/nodes/texture/CMakeLists.txt b/source/blender/nodes/texture/CMakeLists.txt index ed4c7501c89..71734e76e2b 100644 --- a/source/blender/nodes/texture/CMakeLists.txt +++ b/source/blender/nodes/texture/CMakeLists.txt @@ -10,6 +10,7 @@ set(INC ../../blenkernel ../../blentranslation ../../bmesh + ../../imbuf ../../makesrna ../../render ../../windowmanager @@ -59,7 +60,6 @@ set(LIB PRIVATE bf::blenlib PRIVATE bf::depsgraph PRIVATE bf::dna - PRIVATE bf::imbuf PRIVATE bf::intern::guardedalloc bf_nodes ) diff --git a/source/blender/python/gpu/CMakeLists.txt b/source/blender/python/gpu/CMakeLists.txt index 0260024d407..d3fad4318c3 100644 --- a/source/blender/python/gpu/CMakeLists.txt +++ b/source/blender/python/gpu/CMakeLists.txt @@ -7,6 +7,7 @@ set(INC ../../blenkernel ../../editors/include ../../gpu + ../../imbuf ) set(INC_SYS @@ -61,7 +62,6 @@ set(LIB ${PYTHON_LIBRARIES} PRIVATE bf::blenlib PRIVATE bf::dna - PRIVATE bf::imbuf PRIVATE bf::intern::guardedalloc ) diff --git a/source/blender/python/intern/CMakeLists.txt b/source/blender/python/intern/CMakeLists.txt index c510c79da68..84b16de91a4 100644 --- a/source/blender/python/intern/CMakeLists.txt +++ b/source/blender/python/intern/CMakeLists.txt @@ -9,6 +9,7 @@ set(INC ../../blentranslation ../../editors/include ../../gpu + ../../imbuf ../../imbuf/intern/oiio ../../makesrna ../../windowmanager @@ -123,7 +124,6 @@ set(LIB bf_editor_animation bf_editor_interface bf_editor_space_api - PRIVATE bf::imbuf PRIVATE bf::intern::clog PRIVATE bf::intern::guardedalloc PRIVATE bf::animrig diff --git a/source/blender/python/mathutils/CMakeLists.txt b/source/blender/python/mathutils/CMakeLists.txt index 15d525bb040..45693def4a7 100644 --- a/source/blender/python/mathutils/CMakeLists.txt +++ b/source/blender/python/mathutils/CMakeLists.txt @@ -6,6 +6,7 @@ set(INC . ../../blenkernel ../../bmesh + ../../imbuf ) set(INC_SYS @@ -42,7 +43,7 @@ set(LIB PRIVATE bf::blenlib PRIVATE bf::depsgraph PRIVATE bf::dna - PRIVATE bf::imbuf + bf_imbuf PRIVATE bf::intern::guardedalloc bf_python_ext diff --git a/source/blender/render/CMakeLists.txt b/source/blender/render/CMakeLists.txt index 57e08031f3d..7faa4393627 100644 --- a/source/blender/render/CMakeLists.txt +++ b/source/blender/render/CMakeLists.txt @@ -13,6 +13,7 @@ set(INC ../draw ../gpu ../gpu/intern + ../imbuf ../makesrna ../nodes ../sequencer @@ -61,7 +62,6 @@ set(LIB PRIVATE bf::blenlib PRIVATE bf::depsgraph PRIVATE bf::dna - PRIVATE bf::imbuf PRIVATE bf::intern::guardedalloc bf_realtime_compositor PRIVATE bf::intern::atomic diff --git a/source/blender/render/hydra/CMakeLists.txt b/source/blender/render/hydra/CMakeLists.txt index 8bf56942c25..d9740ef1231 100644 --- a/source/blender/render/hydra/CMakeLists.txt +++ b/source/blender/render/hydra/CMakeLists.txt @@ -39,6 +39,7 @@ set(INC ../../../../intern/guardedalloc ../../blenkernel ../../blenlib + ../../imbuf ../../makesdna ../../makesrna ../../nodes @@ -68,7 +69,6 @@ set(LIB ${USD_LIBRARIES} ${TBB_LIBRARIES} PRIVATE bf::depsgraph - PRIVATE bf::imbuf PRIVATE bf::intern::clog bf_io_usd ) diff --git a/source/blender/sequencer/CMakeLists.txt b/source/blender/sequencer/CMakeLists.txt index 4aa9f363653..ab1b87b367c 100644 --- a/source/blender/sequencer/CMakeLists.txt +++ b/source/blender/sequencer/CMakeLists.txt @@ -8,6 +8,7 @@ set(INC ../blenkernel ../blenloader ../blentranslation + ../imbuf ../makesrna ../render ../windowmanager @@ -81,7 +82,6 @@ set(LIB PRIVATE bf::blenlib PRIVATE bf::depsgraph PRIVATE bf::dna - PRIVATE bf::imbuf PRIVATE bf::intern::atomic PRIVATE bf::intern::clog PRIVATE bf::intern::guardedalloc diff --git a/source/blender/simulation/CMakeLists.txt b/source/blender/simulation/CMakeLists.txt index f3d2636f0e0..e32dfb319e3 100644 --- a/source/blender/simulation/CMakeLists.txt +++ b/source/blender/simulation/CMakeLists.txt @@ -6,6 +6,8 @@ set(INC . intern ../blenkernel + ../functions + ../imbuf ../makesrna ../nodes ) @@ -32,8 +34,6 @@ set(LIB PRIVATE bf::blenlib PRIVATE bf::depsgraph PRIVATE bf::dna - PRIVATE bf::functions - PRIVATE bf::imbuf PRIVATE bf::intern::guardedalloc ) diff --git a/source/blender/windowmanager/CMakeLists.txt b/source/blender/windowmanager/CMakeLists.txt index 77a423783aa..6737ddeb6fd 100644 --- a/source/blender/windowmanager/CMakeLists.txt +++ b/source/blender/windowmanager/CMakeLists.txt @@ -14,6 +14,7 @@ set(INC ../editors/include ../draw ../gpu + ../imbuf ../makesrna ../nodes ../render @@ -100,7 +101,6 @@ set(LIB PRIVATE bf::depsgraph PRIVATE bf::dna bf_editor_screen - PRIVATE bf::imbuf PRIVATE bf::intern::clog PRIVATE bf::intern::guardedalloc PRIVATE bf::animrig diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 6c4363bad58..67f9af21a89 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -6,6 +6,7 @@ set(INC ../blender/blenkernel ../blender/editors/include ../blender/gpu + ../blender/imbuf ../blender/io/usd ../blender/bmesh ../blender/makesrna @@ -17,7 +18,6 @@ set(LIB PRIVATE bf::blenlib PRIVATE bf::depsgraph PRIVATE bf::dna - PRIVATE bf::imbuf PRIVATE bf::intern::clog PRIVATE bf::intern::guardedalloc bf_windowmanager -- 2.30.2