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)

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
 )
 

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}")

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}

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

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
 )

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
 )
 

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

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

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
 )

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

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
 )

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
 )

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
 )
 

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
 )

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
 )

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

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

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
 )
 

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
 )
 

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

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
 )
 

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

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
 )

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
 )
 

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
 )

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
 )

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
 )

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
 )
 

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
 )
 

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
 )

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

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

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
 )
 

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})
 

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)

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)

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)

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}

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
 )
 

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
 )
 

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
 )