blender
/
blender
135
420
Fork 601
Code Issues 6.3k Pull Requests 766 Projects 19 Wiki Activity

Cleanup: CMake: Modernize bf_blenfont dependencies #115365

Merged
Ray molenkamp merged 1 commits from LazyDodo/blender:tmp_blenfont_update into main 2023-11-24 18:29:20 +01:00
Conversation 1 Commits 1 Files Changed 27 +28 -29
27 changed files with 28 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,7 +3,7 @@
# SPDX-License-Identifier: GPL-2.0-or-later
set(INC
.
PUBLIC .
../blenkernel
../blentranslation
../gpu
@ -54,3 +54,4 @@ endif()
blender_add_lib(bf_blenfont "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
add_library(bf::blenfont ALIAS bf_blenfont)

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

@ -5,7 +5,6 @@
set(INC
.
../asset_system
../blenfont
../blenloader
../blentranslation
../bmesh
@ -539,7 +538,7 @@ set(SRC
set(LIB
PRIVATE bf::animrig
bf_asset_system
bf_blenfont
PRIVATE bf::blenfont
PRIVATE bf::blenlib
bf_blenloader
bf_blentranslation

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

@ -4,7 +4,6 @@
set(INC
.
../blenfont
../blenkernel
../blentranslation
../depsgraph
@ -60,6 +59,7 @@ set(SRC
set(LIB
PRIVATE bf::animrig
PRIVATE bf::blenfont
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::dna

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

@ -6,7 +6,6 @@ set(INC
.
intern
../blenfont
../blenkernel
../blenloader
../blentranslation
@ -349,6 +348,7 @@ set(SRC
)
set(LIB
PRIVATE bf::blenfont
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::dna

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

@ -5,7 +5,6 @@
set(INC
../include
../../asset_system
../../blenfont
../../blenkernel
../../blenloader
../../blentranslation
@ -46,6 +45,7 @@ set(SRC
set(LIB
PRIVATE bf::animrig
PRIVATE bf::blenfont
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::dna

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

@ -4,7 +4,6 @@
set(INC
../include
../../blenfont
../../blenkernel
../../blentranslation
../../bmesh
@ -58,6 +57,7 @@ set(SRC
set(LIB
PRIVATE bf::animrig
PRIVATE bf::blenfont
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::dna

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

@ -6,7 +6,6 @@ set(INC
.
../include
../../asset_system
../../blenfont
../../blenkernel
../../blenloader
../../blentranslation
@ -97,6 +96,7 @@ set(SRC
)
set(LIB
PRIVATE bf::blenfont
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::dna

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

@ -5,7 +5,6 @@
set(INC
../include
../uvedit
../../blenfont
../../blenkernel
../../blentranslation
../../bmesh
@ -63,6 +62,7 @@ set(SRC
)
set(LIB
PRIVATE bf::blenfont
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::dna

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

@ -5,7 +5,6 @@
set(INC
../include
../../asset_system
../../blenfont
../../blenkernel
../../blentranslation
../../bmesh
@ -63,6 +62,7 @@ set(SRC
set(LIB
PRIVATE bf::animrig
PRIVATE bf::blenfont
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::dna

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

@ -6,7 +6,6 @@ set(INC
../asset
../include
../../asset_system
../../blenfont
../../blenkernel
../../blenloader
../../blentranslation
@ -45,6 +44,7 @@ set(SRC
set(LIB
PRIVATE bf::animrig
PRIVATE bf::blenfont
PRIVATE bf::blenlib
PRIVATE bf::dna
bf_editor_datafiles

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

@ -4,7 +4,6 @@
set(INC
../include
../../blenfont
../../blenkernel
../../blenloader
../../blentranslation
@ -47,6 +46,7 @@ set(SRC
)
set(LIB
PRIVATE bf::blenfont
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::dna

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

@ -4,7 +4,6 @@
set(INC
../include
../../blenfont
../../blenkernel
../../blenloader
../../gpu
@ -25,6 +24,7 @@ set(SRC
)
set(LIB
PRIVATE bf::blenfont
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::dna

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

@ -6,7 +6,6 @@ set(INC
../asset
../include
../../asset_system
../../blenfont
../../blenkernel
../../blenloader
../../blentranslation
@ -46,6 +45,7 @@ set(SRC
)
set(LIB
PRIVATE bf::blenfont
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::dna

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

@ -4,7 +4,6 @@
set(INC
../include
../../blenfont
../../blenkernel
../../blenloader
../../blentranslation
@ -37,6 +36,7 @@ set(SRC
)
set(LIB
PRIVATE bf::blenfont
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::dna

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

@ -4,7 +4,6 @@
set(INC
../include
../../blenfont
../../blenkernel
../../blenloader
../../blentranslation
@ -35,6 +34,7 @@ set(SRC
)
set(LIB
PRIVATE bf::blenfont
PRIVATE bf::blenlib
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc

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

@ -5,7 +5,6 @@
set(INC
../include
../../asset_system
../../blenfont
../../blenkernel
../../blenloader
../../blentranslation
@ -53,6 +52,7 @@ set(SRC
)
set(LIB
PRIVATE bf::blenfont
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::dna

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

@ -4,7 +4,6 @@
set(INC
../include
../../blenfont
../../blenkernel
../../blenloader
../../blentranslation
@ -48,6 +47,7 @@ set(SRC
)
set(LIB
PRIVATE bf::blenfont
PRIVATE bf::blenlib
PRIVATE bf::dna
bf_editor_interface

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

@ -4,7 +4,6 @@
set(INC
../include
../../blenfont
../../blenkernel
../../blenloader
../../blentranslation
@ -51,6 +50,7 @@ set(SRC
)
set(LIB
PRIVATE bf::blenfont
PRIVATE bf::blenlib
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc

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

@ -4,7 +4,6 @@
set(INC
../include
../../blenfont
../../blenkernel
../../blenloader
../../blentranslation
@ -35,6 +34,7 @@ set(SRC
)
set(LIB
PRIVATE bf::blenfont
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::dna

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

@ -6,7 +6,6 @@ set(INC
../asset
../include
../../asset_system
../../blenfont
../../blenkernel
../../blenloader
../../blentranslation
@ -81,6 +80,7 @@ set(SRC
set(LIB
PRIVATE bf::animrig
PRIVATE bf::blenfont
PRIVATE bf::blenlib
PRIVATE bf::dna
bf_editor_curves

3
source/blender/editors/transform/CMakeLists.txt
View File

@ -4,7 +4,6 @@
set(INC
../include
../../blenfont
../../blenkernel
../../blentranslation
../../bmesh
@ -118,7 +117,7 @@ set(SRC
set(LIB
PRIVATE bf::animrig
bf_blenfont
PRIVATE bf::blenfont
bf_blenkernel
PRIVATE bf::blenlib
bf_bmesh

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

@ -6,7 +6,6 @@ set(INC
../include
../space_sequencer
../../asset_system
../../blenfont
../../blenkernel
../../blentranslation
../../bmesh
@ -110,6 +109,7 @@ set(SRC
set(LIB
PRIVATE bf::animrig
PRIVATE bf::blenfont
PRIVATE bf::blenlib
PRIVATE bf::dna
PRIVATE bf::intern::clog

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

@ -5,7 +5,6 @@
set(INC
.
intern
../blenfont
../blenkernel
../blentranslation
../bmesh
@ -89,6 +88,7 @@ list(APPEND LIB
endif()
set(LIB
PRIVATE bf::blenfont
PRIVATE bf::blenlib
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc

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

@ -5,7 +5,6 @@
set(INC
.
intern
../blenfont
../blenkernel
../blenloader
../blentranslation
@ -107,6 +106,7 @@ set(SRC
)
set(LIB
PRIVATE bf::blenfont
bf_blenkernel
PRIVATE bf::blenlib
PUBLIC bf::dna

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

@ -5,7 +5,6 @@
set(INC
.
intern
../blenfont
../blenkernel
../blenloader
../blentranslation
@ -81,6 +80,7 @@ set(SRC
)
set(LIB
PRIVATE bf::blenfont
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::dna

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

@ -5,7 +5,6 @@
set(INC
.
intern
../blenfont
../blenkernel
../blentranslation
../bmesh
@ -43,6 +42,7 @@ set(SRC
)
set(LIB
PRIVATE bf::blenfont
PRIVATE bf::blenlib
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc

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

@ -7,7 +7,6 @@ set(INC
gizmo
gizmo/intern
../asset_system
../blenfont
../blenkernel
../blenloader
../blentranslation
@ -98,6 +97,7 @@ set(SRC
)
set(LIB
PRIVATE bf::blenfont
PRIVATE bf::blenlib
PRIVATE bf::dna
bf_editor_screen