tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

Cleanup: CMake: Modernize bf_intern_clog dependencies 

Pretty straightforward

- Remove any bf_intern_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/115323
This commit is contained in:
Ray Molenkamp 2023-11-24 17:12:24 +01:00 committed by Ray molenkamp
parent b607c8677a
commit b683bcc46c
35 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
intern/clog/CMakeLists.txt
View File

@ -3,8 +3,7 @@
# SPDX-License-Identifier: GPL-2.0-or-later
set(INC
.
../atomic
PUBLIC .
)
set(INC_SYS
@ -19,9 +18,11 @@ 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}")
add_library(bf::intern::clog ALIAS bf_intern_clog)

2
intern/ghost/CMakeLists.txt
View File

@ -4,7 +4,6 @@
set(INC
PUBLIC .
../clog
../../source/blender/imbuf
)
@ -73,6 +72,7 @@ set(SRC
set(LIB
PRIVATE bf::blenlib
PRIVATE bf::dna
PRIVATE bf::intern::clog
)
if(WITH_INPUT_IME)

2
source/blender/asset_system/CMakeLists.txt
View File

@ -6,7 +6,6 @@ set(INC
.
intern
../blenkernel
../../../intern/clog
)
set(INC_SYS
@ -42,6 +41,7 @@ set(LIB
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::dna
PRIVATE bf::intern::clog
PRIVATE bf::intern::guardedalloc
)

3
source/blender/blenkernel/CMakeLists.txt
View File

@ -26,7 +26,6 @@ set(INC
../../../intern/eigen
../../../intern/ghost
../../../intern/iksolver/extern
../../../intern/clog
../../../intern/libmv
../../../intern/mantaflow/extern
../../../intern/memutil
@ -554,7 +553,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.

2
source/blender/blenloader/CMakeLists.txt
View File

@ -17,7 +17,6 @@ set(INC
../render
../sequencer
../windowmanager
../../../intern/clog
../bmesh
# RNA_prototypes.h
@ -64,6 +63,7 @@ set(LIB
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::dna
PRIVATE bf::intern::clog
PRIVATE bf::intern::guardedalloc
)

2
source/blender/bmesh/CMakeLists.txt
View File

@ -7,7 +7,6 @@ set(INC
../blenkernel
../blentranslation
../depsgraph
../../../intern/clog
../../../intern/eigen
../../../extern/rangetree
)
@ -169,6 +168,7 @@ set(LIB
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::dna
PRIVATE bf::intern::clog
PRIVATE bf::intern::guardedalloc
extern_rangetree
PRIVATE bf::intern::atomic

2
source/blender/compositor/CMakeLists.txt
View File

@ -22,7 +22,6 @@ if(WITH_COMPOSITOR_CPU)
../render
../render/intern
../../../extern/clew/include
../../../intern/clog
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
@ -601,6 +600,7 @@ if(WITH_COMPOSITOR_CPU)
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::dna
PRIVATE bf::intern::clog
PRIVATE bf::intern::guardedalloc
extern_clew
PRIVATE bf::intern::atomic

2
source/blender/draw/CMakeLists.txt
View File

@ -27,7 +27,6 @@ set(INC
../compositor/realtime_compositor/cached_resources
../windowmanager
../../../intern/clog
../../../intern/opensubdiv
)
@ -353,6 +352,7 @@ set(LIB
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::dna
PRIVATE bf::intern::clog
PRIVATE bf::intern::guardedalloc
bf_realtime_compositor
bf_windowmanager

2
source/blender/editors/animation/CMakeLists.txt
View File

@ -11,7 +11,6 @@ set(INC
../../makesrna
../../sequencer
../../windowmanager
../../../../intern/clog
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
)
@ -47,6 +46,7 @@ set(LIB
PRIVATE bf::animrig
PRIVATE bf::blenlib
PRIVATE bf::dna
PRIVATE bf::intern::clog
PRIVATE bf::intern::guardedalloc
)

2
source/blender/editors/armature/CMakeLists.txt
View File

@ -13,7 +13,6 @@ set(INC
../../gpu
../../makesrna
../../windowmanager
../../../../intern/clog
../../../../intern/eigen
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
@ -50,6 +49,7 @@ set(LIB
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::dna
PRIVATE bf::intern::clog
PRIVATE bf::intern::guardedalloc
)

2
source/blender/editors/asset/CMakeLists.txt
View File

@ -11,7 +11,6 @@ set(INC
../../blentranslation
../../makesrna
../../windowmanager
../../../../intern/clog
# dna_type_offsets.h
${CMAKE_CURRENT_BINARY_DIR}/../../makesdna/intern
# RNA_prototypes.h
@ -63,6 +62,7 @@ set(LIB
PRIVATE bf::blenlib
bf_blenloader
PRIVATE bf::dna
PRIVATE bf::intern::clog
PRIVATE bf::intern::guardedalloc
)

2
source/blender/editors/curve/CMakeLists.txt
View File

@ -10,7 +10,6 @@ set(INC
../../gpu
../../makesrna
../../windowmanager
../../../../intern/clog
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
)
@ -38,6 +37,7 @@ set(LIB
PRIVATE bf::blenlib
PRIVATE bf::dna
PRIVATE bf::extern::curve_fit_nd
PRIVATE bf::intern::clog
PRIVATE bf::intern::guardedalloc
)

2
source/blender/editors/curves/CMakeLists.txt
View File

@ -12,7 +12,6 @@ set(INC
../../gpu
../../makesrna
../../windowmanager
../../../../intern/clog
../../bmesh
# RNA_prototypes.h
@ -37,6 +36,7 @@ set(LIB
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::dna
PRIVATE bf::intern::clog
PRIVATE bf::intern::guardedalloc
)

2
source/blender/editors/gizmo_library/CMakeLists.txt
View File

@ -11,7 +11,6 @@ set(INC
../../gpu
../../makesrna
../../windowmanager
../../../../intern/clog
../../../../intern/eigen
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
@ -43,6 +42,7 @@ set(SRC
set(LIB
PRIVATE bf::blenlib
PRIVATE bf::dna
PRIVATE bf::intern::clog
PRIVATE bf::intern::guardedalloc
)

2
source/blender/editors/lattice/CMakeLists.txt
View File

@ -9,7 +9,6 @@ set(INC
../../makesrna
../../render
../../windowmanager
../../../../intern/clog
)
set(INC_SYS
@ -28,6 +27,7 @@ set(SRC
set(LIB
PRIVATE bf::blenlib
PRIVATE bf::dna
PRIVATE bf::intern::clog
PRIVATE bf::intern::guardedalloc
)

2
source/blender/editors/mesh/CMakeLists.txt
View File

@ -18,7 +18,6 @@ set(INC
../../makesrna
../../render
../../windowmanager
../../../../intern/clog
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
)
@ -67,6 +66,7 @@ set(LIB
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::dna
PRIVATE bf::intern::clog
PRIVATE bf::intern::guardedalloc
bf_windowmanager
)

2
source/blender/editors/metaball/CMakeLists.txt
View File

@ -10,7 +10,6 @@ set(INC
../../makesrna
../../render
../../windowmanager
../../../../intern/clog
)
set(INC_SYS
@ -28,6 +27,7 @@ set(SRC
set(LIB
PRIVATE bf::blenlib
PRIVATE bf::dna
PRIVATE bf::intern::clog
PRIVATE bf::intern::guardedalloc
)

2
source/blender/editors/object/CMakeLists.txt
View File

@ -21,7 +21,6 @@ set(INC
../../render
../../shader_fx
../../windowmanager
../../../../intern/clog
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
@ -69,6 +68,7 @@ set(LIB
PRIVATE bf::dna
bf_editor_mesh
bf_editor_grease_pencil
PRIVATE bf::intern::clog
PRIVATE bf::intern::guardedalloc
bf_render
bf_windowmanager

2
source/blender/editors/physics/CMakeLists.txt
View File

@ -10,7 +10,6 @@ set(INC
../../gpu
../../makesrna
../../windowmanager
../../../../intern/clog
../../../../intern/mantaflow/extern
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
@ -40,6 +39,7 @@ set(LIB
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::dna
PRIVATE bf::intern::clog
PRIVATE bf::intern::guardedalloc
)

2
source/blender/editors/sculpt_paint/CMakeLists.txt
View File

@ -18,7 +18,6 @@ set(INC
../../nodes
../../render
../../windowmanager
../../../../intern/clog
../../../../intern/eigen
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
@ -101,6 +100,7 @@ set(LIB
PRIVATE bf::blenlib
PRIVATE bf::dna
PRIVATE bf::intern::atomic
PRIVATE bf::intern::clog
PRIVATE bf::intern::guardedalloc
)

2
source/blender/editors/space_image/CMakeLists.txt
View File

@ -16,7 +16,6 @@ set(INC
../../makesrna
../../render
../../windowmanager
../../../../intern/clog
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
@ -42,6 +41,7 @@ set(LIB
PRIVATE bf::blenlib
PRIVATE bf::dna
bf_editor_uvedit
PRIVATE bf::intern::clog
PRIVATE bf::intern::guardedalloc
)

2
source/blender/editors/space_outliner/CMakeLists.txt
View File

@ -13,7 +13,6 @@ set(INC
../../makesrna
../../sequencer
../../windowmanager
../../../../intern/clog
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
@ -136,6 +135,7 @@ set(LIB
PRIVATE bf::blenlib
PRIVATE bf::dna
bf_editor_undo
PRIVATE bf::intern::clog
PRIVATE bf::intern::guardedalloc
)

2
source/blender/editors/undo/CMakeLists.txt
View File

@ -10,7 +10,6 @@ set(INC
../../blentranslation
../../makesrna
../../windowmanager
../../../../intern/clog
../../bmesh
)
@ -35,6 +34,7 @@ set(LIB
bf_editor_mesh
bf_editor_metaball
bf_editor_physics
PRIVATE bf::intern::clog
PRIVATE bf::intern::guardedalloc
)

2
source/blender/editors/util/CMakeLists.txt
View File

@ -16,7 +16,6 @@ set(INC
../../makesrna
../../sequencer
../../windowmanager
../../../../intern/clog
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
)
@ -113,6 +112,7 @@ set(LIB
PRIVATE bf::animrig
PRIVATE bf::blenlib
PRIVATE bf::dna
PRIVATE bf::intern::clog
PRIVATE bf::intern::guardedalloc
)

2
source/blender/gpu/CMakeLists.txt
View File

@ -29,7 +29,6 @@ set(INC
# For node muting stuff.
../nodes
../../../intern/clog
../../../intern/ghost
../../../intern/mantaflow/extern
)
@ -332,6 +331,7 @@ set(LIB
PRIVATE bf::blenlib
PRIVATE bf::dna
PRIVATE bf::intern::atomic
PRIVATE bf::intern::clog
PRIVATE bf::intern::guardedalloc
)

2
source/blender/io/alembic/CMakeLists.txt
View File

@ -13,7 +13,6 @@ set(INC
../../editors/include
../../makesrna
../../windowmanager
../../../../intern/clog
../../../../intern/utfconv
)
@ -91,6 +90,7 @@ set(LIB
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::dna
PRIVATE bf::intern::clog
PRIVATE bf::intern::guardedalloc
bf_io_common

2
source/blender/io/gpencil/CMakeLists.txt
View File

@ -13,7 +13,6 @@ set(INC
../../makesdna
../../makesrna
../../windowmanager
../../../../intern/clog
../../../../intern/guardedalloc
../../../../intern/utfconv
)
@ -39,6 +38,7 @@ set(LIB
PRIVATE bf::blenlib
PRIVATE bf::dna
PRIVATE bf::extern::nanosvg
PRIVATE bf::intern::clog
PRIVATE bf::intern::guardedalloc
bf_io_common
)

2
source/blender/io/usd/CMakeLists.txt
View File

@ -68,7 +68,6 @@ set(INC
../../nodes
../../python/intern
../../windowmanager
../../../../intern/clog
../../../../intern/utfconv
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
@ -186,6 +185,7 @@ set(LIB
PRIVATE bf::dna
PRIVATE bf::animrig
bf_imbuf
PRIVATE bf::intern::clog
PRIVATE bf::intern::guardedalloc
bf_io_common
)

2
source/blender/nodes/shader/CMakeLists.txt
View File

@ -16,7 +16,6 @@ set(INC
../../makesrna
../../render
../../windowmanager
../../../../intern/clog
../../../../intern/sky/include
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
@ -131,6 +130,7 @@ set(LIB
PRIVATE bf::blenlib
PRIVATE bf::dna
bf_functions
PRIVATE bf::intern::clog
PRIVATE bf::intern::guardedalloc
bf_intern_sky
bf_nodes

2
source/blender/python/generic/CMakeLists.txt
View File

@ -7,7 +7,6 @@ set(INC
../../blenkernel
../../gpu
../../makesrna
../../../../intern/clog
)
set(INC_SYS
@ -44,6 +43,7 @@ set(LIB
${PYTHON_LIBRARIES}
PRIVATE bf::blenlib
PRIVATE bf::dna
PRIVATE bf::intern::clog
PRIVATE bf::intern::guardedalloc
)

2
source/blender/python/intern/CMakeLists.txt
View File

@ -14,7 +14,6 @@ set(INC
../../imbuf/intern/oiio
../../makesrna
../../windowmanager
../../../../intern/clog
../../../../intern/mantaflow/extern
../../../../intern/opencolorio
# RNA_prototypes.h
@ -125,6 +124,7 @@ set(LIB
bf_editor_animation
bf_editor_interface
bf_editor_space_api
PRIVATE bf::intern::clog
PRIVATE bf::intern::guardedalloc
PRIVATE bf::animrig
bf_python_gpu

2
source/blender/render/hydra/CMakeLists.txt
View File

@ -36,7 +36,6 @@ if(WIN32)
endif()
set(INC
../../../../intern/clog
../../../../intern/guardedalloc
../../blenkernel
../../blenlib
@ -70,6 +69,7 @@ set(LIB
${BOOST_LIBRARIES}
${USD_LIBRARIES}
${TBB_LIBRARIES}
PRIVATE bf::intern::clog
bf_io_usd
)

2
source/blender/sequencer/CMakeLists.txt
View File

@ -14,7 +14,6 @@ set(INC
../makesrna
../render
../windowmanager
../../../intern/clog
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
@ -86,6 +85,7 @@ set(LIB
PRIVATE bf::blenlib
PRIVATE bf::dna
PRIVATE bf::intern::atomic
PRIVATE bf::intern::clog
PRIVATE bf::intern::guardedalloc
)

2
source/blender/windowmanager/CMakeLists.txt
View File

@ -21,7 +21,6 @@ set(INC
../nodes
../render
../sequencer
../../../intern/clog
../../../intern/memutil
../../../extern/fmtlib/include
../bmesh
@ -102,6 +101,7 @@ set(LIB
PRIVATE bf::blenlib
PRIVATE bf::dna
bf_editor_screen
PRIVATE bf::intern::clog
PRIVATE bf::intern::guardedalloc
PRIVATE bf::animrig
bf_sequencer

2
source/creator/CMakeLists.txt
View File

@ -3,7 +3,6 @@
# SPDX-License-Identifier: GPL-2.0-or-later
set(INC
../../intern/clog
../blender/blenkernel
../blender/depsgraph
../blender/editors/include
@ -19,6 +18,7 @@ set(INC
set(LIB
PRIVATE bf::blenlib
PRIVATE bf::dna
PRIVATE bf::intern::clog
PRIVATE bf::intern::guardedalloc
bf_windowmanager
)