Cleanup: CMake: Modernize bf_intern_clog dependencies

Pretty straightforward - Remove any clog paths from INC - Add a dependency though LIB when missing context: https://devtalk.blender.org/t/cmake-cleanup/30260 Pull Request: https://projects.blender.org/blender/blender/pulls/110350
2023-07-21 18:37:30 +02:00 · 2023-07-21 18:37:30 +02:00 · 0f541db97c
commit 0f541db97c
parent be516e8c81
32 changed files with 38 additions and 37 deletions
--- a/intern/clog/CMakeLists.txt
+++ b/intern/clog/CMakeLists.txt
@ -3,8 +3,7 @@
 # SPDX-License-Identifier: GPL-2.0-or-later

 set(INC
-  .
-  ../atomic
+  PUBLIC .
 )

 set(INC_SYS
@ -19,9 +18,12 @@ set(SRC

 set(LIB
  PRIVATE bf::intern::guardedalloc
+  PRIVATE bf::intern::atomic
 )

-# Disabled for makesdna/makesrna.
-add_definitions(-DWITH_CLOG_PTHREADS)
-
 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_library(bf::intern::clog ALIAS bf_intern_clog)
--- a/intern/ghost/CMakeLists.txt
+++ b/intern/ghost/CMakeLists.txt
@ -4,7 +4,6 @@

 set(INC
  .
-  ../clog
  ../../source/blender/imbuf
 )

@ -75,6 +74,7 @@ set(LIB
  ${Epoxy_LIBRARIES}
  PRIVATE bf::blenlib
  PRIVATE bf::dna
+  PRIVATE bf::intern::clog
 )

 if(WITH_OPENGL_BACKEND)
--- a/source/blender/asset_system/CMakeLists.txt
+++ b/source/blender/asset_system/CMakeLists.txt
@ -5,7 +5,6 @@
 set(INC
  .
  intern
-  ../../../intern/clog
 )

 set(INC_SYS
@ -41,6 +40,7 @@ set(LIB
  PRIVATE bf::blenkernel
  PRIVATE bf::blenlib
  PRIVATE bf::dna
+  PRIVATE bf::intern::clog
  PRIVATE bf::intern::guardedalloc
 )

--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@ -24,7 +24,6 @@ set(INC
  ../../../intern/eigen
  ../../../intern/ghost
  ../../../intern/iksolver/extern
-  ../../../intern/clog
  ../../../intern/libmv
  ../../../intern/mantaflow/extern
  ../../../intern/memutil
@ -537,7 +536,7 @@ set(LIB
  bf_gpu
  bf_ikplugin
  bf_imbuf
-  bf_intern_clog
+  PRIVATE bf::intern::clog
  bf_intern_ghost
  PRIVATE bf::intern::guardedalloc
  bf_intern_libmv  # Uses stub when disabled.
--- a/source/blender/blenloader/CMakeLists.txt
+++ b/source/blender/blenloader/CMakeLists.txt
@ -13,7 +13,6 @@ set(INC
  ../nodes
  ../render
  ../sequencer
-  ../../../intern/clog
  ../bmesh

  # RNA_prototypes.h
@ -61,6 +60,7 @@ set(LIB
  PRIVATE bf::blentranslation
  PRIVATE bf::depsgraph
  PRIVATE bf::dna
+  PRIVATE bf::intern::clog
  PRIVATE bf::intern::guardedalloc
  PRIVATE bf::windowmanager
 )
--- a/source/blender/bmesh/CMakeLists.txt
+++ b/source/blender/bmesh/CMakeLists.txt
@ -4,7 +4,6 @@

 set(INC
  .
-  ../../../intern/clog
  ../../../intern/eigen
  ../../../extern/rangetree
 )
@ -168,6 +167,7 @@ set(LIB
  PRIVATE bf::blentranslation
  PRIVATE bf::depsgraph
  PRIVATE bf::dna
+  PRIVATE bf::intern::clog
  PRIVATE bf::intern::guardedalloc
  extern_rangetree
  PRIVATE bf::intern::atomic
--- a/source/blender/compositor/CMakeLists.txt
+++ b/source/blender/compositor/CMakeLists.txt
@ -18,7 +18,6 @@ if(WITH_COMPOSITOR_CPU)
    ../render
    ../render/intern
    ../../../extern/clew/include
-    ../../../intern/clog

    # RNA_prototypes.h
    ${CMAKE_BINARY_DIR}/source/blender/makesrna
@ -595,6 +594,7 @@ if(WITH_COMPOSITOR_CPU)
    PRIVATE bf::blentranslation
    PRIVATE bf::depsgraph
    PRIVATE bf::dna
+    PRIVATE bf::intern::clog
    PRIVATE bf::intern::guardedalloc
    PRIVATE bf::windowmanager
    extern_clew
--- a/source/blender/draw/CMakeLists.txt
+++ b/source/blender/draw/CMakeLists.txt
@ -23,7 +23,6 @@ set(INC
  ../compositor/realtime_compositor/algorithms
  ../compositor/realtime_compositor/cached_resources

-  ../../../intern/clog
  ../../../intern/opensubdiv

 )
@ -353,6 +352,7 @@ set(LIB
  PRIVATE bf::blentranslation
  PRIVATE bf::depsgraph
  PRIVATE bf::dna
+  PRIVATE bf::intern::clog
  PRIVATE bf::intern::guardedalloc
  bf_realtime_compositor
  PRIVATE bf::windowmanager
--- a/source/blender/editors/animation/CMakeLists.txt
+++ b/source/blender/editors/animation/CMakeLists.txt
@ -7,7 +7,6 @@ set(INC
  ../../gpu
  ../../makesrna
  ../../sequencer
-  ../../../../intern/clog
  # RNA_prototypes.h
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
@ -44,6 +43,7 @@ set(LIB
  PRIVATE bf::blentranslation
  PRIVATE bf::depsgraph
  PRIVATE bf::dna
+  PRIVATE bf::intern::clog
  PRIVATE bf::intern::guardedalloc
  PRIVATE bf::windowmanager
 )
--- a/source/blender/editors/armature/CMakeLists.txt
+++ b/source/blender/editors/armature/CMakeLists.txt
@ -9,7 +9,6 @@ set(INC
  ../../blenloader
  ../../gpu
  ../../makesrna
-  ../../../../intern/clog
  ../../../../intern/eigen
  # RNA_prototypes.h
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
@ -47,6 +46,7 @@ set(LIB
  PRIVATE bf::blentranslation
  PRIVATE bf::depsgraph
  PRIVATE bf::dna
+  PRIVATE bf::intern::clog
  PRIVATE bf::intern::guardedalloc
  PRIVATE bf::windowmanager
 )
--- a/source/blender/editors/asset/CMakeLists.txt
+++ b/source/blender/editors/asset/CMakeLists.txt
@ -8,7 +8,6 @@ set(INC
  ../../asset_system
  ../../blenloader
  ../../makesrna
-  ../../../../intern/clog
  # RNA_prototypes.h
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
@ -51,6 +50,7 @@ set(LIB
  bf_blenloader
  PRIVATE bf::blentranslation
  PRIVATE bf::dna
+  PRIVATE bf::intern::clog
  PRIVATE bf::intern::guardedalloc
  PRIVATE bf::windowmanager
 )
--- a/source/blender/editors/curve/CMakeLists.txt
+++ b/source/blender/editors/curve/CMakeLists.txt
@ -6,7 +6,6 @@ set(INC
  ../include
  ../../gpu
  ../../makesrna
-  ../../../../intern/clog
  ../../../../extern/curve_fit_nd
  # RNA_prototypes.h
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
@ -36,6 +35,7 @@ set(LIB
  PRIVATE bf::blentranslation
  PRIVATE bf::depsgraph
  PRIVATE bf::dna
+  PRIVATE bf::intern::clog
  PRIVATE bf::intern::guardedalloc
  PRIVATE bf::windowmanager
  extern_curve_fit_nd
--- a/source/blender/editors/curves/CMakeLists.txt
+++ b/source/blender/editors/curves/CMakeLists.txt
@ -8,7 +8,6 @@ set(INC
  ../../geometry
  ../../gpu
  ../../makesrna
-  ../../../../intern/clog
  ../../bmesh

  # RNA_prototypes.h
@ -31,6 +30,7 @@ set(LIB
  PRIVATE bf::blentranslation
  PRIVATE bf::depsgraph
  PRIVATE bf::dna
+  PRIVATE bf::intern::clog
  PRIVATE bf::intern::guardedalloc
  PRIVATE bf::windowmanager
 )
--- a/source/blender/editors/gizmo_library/CMakeLists.txt
+++ b/source/blender/editors/gizmo_library/CMakeLists.txt
@ -7,7 +7,6 @@ set(INC
  ../../bmesh
  ../../gpu
  ../../makesrna
-  ../../../../intern/clog
  ../../../../intern/eigen
  # RNA_prototypes.h
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
@ -42,6 +41,7 @@ set(LIB
  PRIVATE bf::blentranslation
  PRIVATE bf::depsgraph
  PRIVATE bf::dna
+  PRIVATE bf::intern::clog
  PRIVATE bf::intern::guardedalloc
  PRIVATE bf::windowmanager
 )
--- a/source/blender/editors/lattice/CMakeLists.txt
+++ b/source/blender/editors/lattice/CMakeLists.txt
@ -6,7 +6,6 @@ set(INC
  ../include
  ../../makesrna
  ../../render
-  ../../../../intern/clog
 )

 set(INC_SYS
@ -27,6 +26,7 @@ set(LIB
  PRIVATE bf::blenlib
  PRIVATE bf::depsgraph
  PRIVATE bf::dna
+  PRIVATE bf::intern::clog
  PRIVATE bf::intern::guardedalloc
  PRIVATE bf::windowmanager
 )
--- a/source/blender/editors/mesh/CMakeLists.txt
+++ b/source/blender/editors/mesh/CMakeLists.txt
@ -14,7 +14,6 @@ set(INC
  ../../imbuf
  ../../makesrna
  ../../render
-  ../../../../intern/clog
  # RNA_prototypes.h
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
@ -62,6 +61,7 @@ set(LIB
  PRIVATE bf::blentranslation
  PRIVATE bf::depsgraph
  PRIVATE bf::dna
+  PRIVATE bf::intern::clog
  PRIVATE bf::intern::guardedalloc
  PRIVATE bf::windowmanager
 )
--- a/source/blender/editors/metaball/CMakeLists.txt
+++ b/source/blender/editors/metaball/CMakeLists.txt
@ -7,7 +7,6 @@ set(INC
  ../../gpu
  ../../makesrna
  ../../render
-  ../../../../intern/clog
 )

 set(INC_SYS
@ -27,6 +26,7 @@ set(LIB
  PRIVATE bf::blenlib
  PRIVATE bf::depsgraph
  PRIVATE bf::dna
+  PRIVATE bf::intern::clog
  PRIVATE bf::intern::guardedalloc
  PRIVATE bf::windowmanager
 )
--- a/source/blender/editors/object/CMakeLists.txt
+++ b/source/blender/editors/object/CMakeLists.txt
@ -16,7 +16,6 @@ set(INC
  ../../python
  ../../render
  ../../shader_fx
-  ../../../../intern/clog

  # RNA_prototypes.h
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
@ -64,6 +63,7 @@ set(LIB
  PRIVATE bf::dna
  bf_editor_mesh
  bf_editor_grease_pencil
+  PRIVATE bf::intern::clog
  PRIVATE bf::intern::guardedalloc
  bf_render
  PRIVATE bf::windowmanager
--- a/source/blender/editors/physics/CMakeLists.txt
+++ b/source/blender/editors/physics/CMakeLists.txt
@ -6,7 +6,6 @@ set(INC
  ../include
  ../../gpu
  ../../makesrna
-  ../../../../intern/clog
  ../../../../intern/mantaflow/extern
  # RNA_prototypes.h
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
@ -38,6 +37,7 @@ set(LIB
  PRIVATE bf::blentranslation
  PRIVATE bf::depsgraph
  PRIVATE bf::dna
+  PRIVATE bf::intern::clog
  PRIVATE bf::intern::guardedalloc
  PRIVATE bf::windowmanager
 )
--- a/source/blender/editors/sculpt_paint/CMakeLists.txt
+++ b/source/blender/editors/sculpt_paint/CMakeLists.txt
@ -14,7 +14,6 @@ set(INC
  ../../makesrna
  ../../nodes
  ../../render
-  ../../../../intern/clog
  ../../../../intern/eigen
  # RNA_prototypes.h
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
@ -96,6 +95,7 @@ set(LIB
  PRIVATE bf::depsgraph
  PRIVATE bf::dna
  PRIVATE bf::intern::atomic
+  PRIVATE bf::intern::clog
  PRIVATE bf::intern::guardedalloc
  PRIVATE bf::windowmanager
 )
--- a/source/blender/editors/space_image/CMakeLists.txt
+++ b/source/blender/editors/space_image/CMakeLists.txt
@ -12,7 +12,6 @@ set(INC
  ../../imbuf
  ../../makesrna
  ../../render
-  ../../../../intern/clog

  # RNA_prototypes.h
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
@ -40,6 +39,7 @@ set(LIB
  PRIVATE bf::depsgraph
  PRIVATE bf::dna
  bf_editor_uvedit
+  PRIVATE bf::intern::clog
  PRIVATE bf::intern::guardedalloc
  PRIVATE bf::windowmanager
 )
--- a/source/blender/editors/space_outliner/CMakeLists.txt
+++ b/source/blender/editors/space_outliner/CMakeLists.txt
@ -9,7 +9,6 @@ set(INC
  ../../imbuf
  ../../makesrna
  ../../sequencer
-  ../../../../intern/clog

  # RNA_prototypes.h
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
@ -109,6 +108,7 @@ set(LIB
  PRIVATE bf::depsgraph
  PRIVATE bf::dna
  bf_editor_undo
+  PRIVATE bf::intern::clog
  PRIVATE bf::intern::guardedalloc
  PRIVATE bf::windowmanager
 )
--- a/source/blender/editors/undo/CMakeLists.txt
+++ b/source/blender/editors/undo/CMakeLists.txt
@ -7,7 +7,6 @@ set(INC
  ../../asset_system
  ../../blenloader
  ../../makesrna
-  ../../../../intern/clog
  ../../bmesh
 )

@ -33,6 +32,7 @@ set(LIB
  bf_editor_mesh
  bf_editor_metaball
  bf_editor_physics
+  PRIVATE bf::intern::clog
  PRIVATE bf::intern::guardedalloc
  PRIVATE bf::windowmanager
 )
--- a/source/blender/editors/util/CMakeLists.txt
+++ b/source/blender/editors/util/CMakeLists.txt
@ -12,7 +12,6 @@ set(INC
  ../../imbuf
  ../../makesrna
  ../../sequencer
-  ../../../../intern/clog
  # RNA_prototypes.h
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
 )
@ -108,6 +107,7 @@ set(LIB
  PRIVATE bf::blentranslation
  PRIVATE bf::depsgraph
  PRIVATE bf::dna
+  PRIVATE bf::intern::clog
  PRIVATE bf::intern::guardedalloc
  PRIVATE bf::windowmanager
 )
--- a/source/blender/gpu/CMakeLists.txt
+++ b/source/blender/gpu/CMakeLists.txt
@ -27,7 +27,6 @@ set(INC
  # For node muting stuff.
  ../nodes

-  ../../../intern/clog
  ../../../intern/ghost
  ../../../intern/mantaflow/extern
 )
@ -319,6 +318,7 @@ set(LIB
  PRIVATE bf::dna
  PRIVATE bf::intern::atomic
  ${Epoxy_LIBRARIES}
+  PRIVATE bf::intern::clog
  PRIVATE bf::intern::guardedalloc
 )

--- a/source/blender/io/alembic/CMakeLists.txt
+++ b/source/blender/io/alembic/CMakeLists.txt
@ -9,7 +9,6 @@ set(INC
  ../../bmesh
  ../../editors/include
  ../../makesrna
-  ../../../../intern/clog
  ../../../../intern/utfconv
 )

@ -89,6 +88,7 @@ set(LIB
  PRIVATE bf::blentranslation
  PRIVATE bf::depsgraph
  PRIVATE bf::dna
+  PRIVATE bf::intern::clog
  PRIVATE bf::intern::guardedalloc
  bf_io_common

--- a/source/blender/io/gpencil/CMakeLists.txt
+++ b/source/blender/io/gpencil/CMakeLists.txt
@ -10,7 +10,6 @@ set(INC
  ../../editors/include
  ../../makesdna
  ../../makesrna
-  ../../../../intern/clog
  ../../../../intern/guardedalloc
  ../../../../intern/utfconv 
 )
@ -37,6 +36,7 @@ set(LIB
  PRIVATE bf::depsgraph
  PRIVATE bf::dna
  PRIVATE bf::extern::nanosvg
+  PRIVATE bf::intern::clog
  PRIVATE bf::intern::guardedalloc
  bf_io_common
  PRIVATE bf::windowmanager
--- a/source/blender/python/generic/CMakeLists.txt
+++ b/source/blender/python/generic/CMakeLists.txt
@ -6,7 +6,6 @@ set(INC
  .
  ../../gpu
  ../../makesrna
-  ../../../../intern/clog
 )

 set(INC_SYS
@ -45,6 +44,7 @@ set(LIB
  PRIVATE bf::blenkernel
  PRIVATE bf::blenlib
  PRIVATE bf::dna
+  PRIVATE bf::intern::clog
  PRIVATE bf::intern::guardedalloc
 )

--- a/source/blender/python/intern/CMakeLists.txt
+++ b/source/blender/python/intern/CMakeLists.txt
@ -10,7 +10,6 @@ set(INC
  ../../imbuf
  ../../imbuf/intern/oiio
  ../../makesrna
-  ../../../../intern/clog
  ../../../../intern/mantaflow/extern
  ../../../../intern/opencolorio
  # RNA_prototypes.h
@ -124,6 +123,7 @@ set(LIB
  bf_editor_animation
  bf_editor_interface
  bf_editor_space_api
+  PRIVATE bf::intern::clog
  PRIVATE bf::intern::guardedalloc
  bf_python_gpu

--- a/source/blender/sequencer/CMakeLists.txt
+++ b/source/blender/sequencer/CMakeLists.txt
@ -10,7 +10,6 @@ set(INC
  ../imbuf
  ../makesrna
  ../render
-  ../../../intern/clog

  # RNA_prototypes.h
  ${CMAKE_BINARY_DIR}/source/blender/makesrna
@ -85,6 +84,7 @@ set(LIB
  PRIVATE bf::depsgraph
  PRIVATE bf::dna
  PRIVATE bf::intern::atomic
+  PRIVATE bf::intern::clog
  PRIVATE bf::intern::guardedalloc
  PRIVATE bf::windowmanager
 )
--- a/source/blender/windowmanager/CMakeLists.txt
+++ b/source/blender/windowmanager/CMakeLists.txt
@ -18,7 +18,6 @@ set(INC
  ../nodes
  ../render
  ../sequencer
-  ../../../intern/clog
  ../../../intern/ghost
  ../../../intern/memutil
  ../bmesh
@ -100,6 +99,7 @@ set(LIB
  PRIVATE bf::depsgraph
  PRIVATE bf::dna
  bf_editor_screen
+  PRIVATE bf::intern::clog
  PRIVATE bf::intern::guardedalloc
  bf_sequencer
 )
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@ -3,7 +3,6 @@
 # SPDX-License-Identifier: GPL-2.0-or-later

 set(INC
-  ../../intern/clog
  ../blender/editors/include
  ../blender/gpu
  ../blender/imbuf
@ -18,6 +17,7 @@ set(LIB
  PRIVATE bf::blenlib
  PRIVATE bf::depsgraph
  PRIVATE bf::dna
+  PRIVATE bf::intern::clog
  PRIVATE bf::intern::guardedalloc
  PRIVATE bf::windowmanager
 )