From a23aab3ddc3fe2fef2ad381ade86aad21ac75bd4 Mon Sep 17 00:00:00 2001 From: Ray Molenkamp Date: Wed, 25 Dec 2024 18:40:41 +0100 Subject: [PATCH] Cleanup: CMake: Modernize bf_blenloader dependencies Pretty straightforward - Remove any bf_blenloader 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/132334 --- source/blender/blenkernel/CMakeLists.txt | 3 +-- source/blender/blenloader/CMakeLists.txt | 3 ++- source/blender/draw/CMakeLists.txt | 2 +- source/blender/editors/armature/CMakeLists.txt | 2 +- source/blender/editors/asset/CMakeLists.txt | 3 +-- source/blender/editors/interface/CMakeLists.txt | 2 +- source/blender/editors/render/CMakeLists.txt | 2 +- source/blender/editors/screen/CMakeLists.txt | 2 +- source/blender/editors/sculpt_paint/CMakeLists.txt | 2 +- source/blender/editors/space_action/CMakeLists.txt | 2 +- source/blender/editors/space_buttons/CMakeLists.txt | 2 +- source/blender/editors/space_clip/CMakeLists.txt | 2 +- source/blender/editors/space_console/CMakeLists.txt | 2 +- source/blender/editors/space_file/CMakeLists.txt | 2 +- source/blender/editors/space_graph/CMakeLists.txt | 2 +- source/blender/editors/space_image/CMakeLists.txt | 2 +- source/blender/editors/space_info/CMakeLists.txt | 2 +- source/blender/editors/space_nla/CMakeLists.txt | 2 +- source/blender/editors/space_node/CMakeLists.txt | 2 +- source/blender/editors/space_outliner/CMakeLists.txt | 2 +- source/blender/editors/space_script/CMakeLists.txt | 2 +- source/blender/editors/space_sequencer/CMakeLists.txt | 2 +- source/blender/editors/space_spreadsheet/CMakeLists.txt | 2 +- source/blender/editors/space_statusbar/CMakeLists.txt | 2 +- source/blender/editors/space_text/CMakeLists.txt | 2 +- source/blender/editors/space_topbar/CMakeLists.txt | 2 +- source/blender/editors/space_userpref/CMakeLists.txt | 2 +- source/blender/editors/space_view3d/CMakeLists.txt | 2 +- source/blender/editors/undo/CMakeLists.txt | 2 +- source/blender/imbuf/CMakeLists.txt | 3 +-- source/blender/io/alembic/CMakeLists.txt | 2 +- source/blender/io/grease_pencil/CMakeLists.txt | 2 +- source/blender/io/usd/CMakeLists.txt | 2 +- source/blender/modifiers/CMakeLists.txt | 2 +- source/blender/nodes/CMakeLists.txt | 2 +- source/blender/nodes/geometry/CMakeLists.txt | 2 +- source/blender/python/intern/CMakeLists.txt | 2 +- source/blender/sequencer/CMakeLists.txt | 2 +- source/blender/windowmanager/CMakeLists.txt | 2 +- 39 files changed, 40 insertions(+), 42 deletions(-) diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt index dba291fb241..815ff9eb975 100644 --- a/source/blender/blenkernel/CMakeLists.txt +++ b/source/blender/blenkernel/CMakeLists.txt @@ -5,7 +5,6 @@ set(INC PUBLIC . ../asset_system - ../blenloader ../draw ../functions ../ikplugin @@ -558,7 +557,7 @@ set(LIB bf_asset_system PRIVATE bf::blenfont PRIVATE bf::blenlib - bf_blenloader + PRIVATE bf::blenloader PRIVATE bf::blentranslation PRIVATE bf::bmesh PRIVATE bf::depsgraph diff --git a/source/blender/blenloader/CMakeLists.txt b/source/blender/blenloader/CMakeLists.txt index 82c842abbd1..09108976018 100644 --- a/source/blender/blenloader/CMakeLists.txt +++ b/source/blender/blenloader/CMakeLists.txt @@ -3,7 +3,7 @@ # SPDX-License-Identifier: GPL-2.0-or-later set(INC - . + PUBLIC . ../draw ../editors/include ../imbuf @@ -89,6 +89,7 @@ if(WIN32) endif() blender_add_lib(bf_blenloader "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") +add_library(bf::blenloader ALIAS bf_blenloader) # RNA_prototypes.hh add_dependencies(bf_blenloader bf_rna) diff --git a/source/blender/draw/CMakeLists.txt b/source/blender/draw/CMakeLists.txt index 158e8dc17ec..0eeaf5e7ab5 100644 --- a/source/blender/draw/CMakeLists.txt +++ b/source/blender/draw/CMakeLists.txt @@ -6,7 +6,6 @@ set(INC . intern - ../blenloader ../editors/include ../editors/space_view3d ../functions @@ -302,6 +301,7 @@ set(LIB PRIVATE bf::blenfont PRIVATE bf::blenkernel PRIVATE bf::blenlib + PRIVATE bf::blenloader PRIVATE bf::blentranslation PRIVATE bf::bmesh PRIVATE bf::depsgraph diff --git a/source/blender/editors/armature/CMakeLists.txt b/source/blender/editors/armature/CMakeLists.txt index dbc4cd1ce6e..afaae18cea8 100644 --- a/source/blender/editors/armature/CMakeLists.txt +++ b/source/blender/editors/armature/CMakeLists.txt @@ -5,7 +5,6 @@ set(INC ../include ../../asset_system - ../../blenloader ../../makesrna ../../../../intern/eigen # RNA_prototypes.hh @@ -43,6 +42,7 @@ set(LIB PRIVATE bf::blenfont PRIVATE bf::blenkernel PRIVATE bf::blenlib + PRIVATE bf::blenloader PRIVATE bf::blentranslation PRIVATE bf::depsgraph PRIVATE bf::dna diff --git a/source/blender/editors/asset/CMakeLists.txt b/source/blender/editors/asset/CMakeLists.txt index 6651bbc9113..c4d0d6c7b82 100644 --- a/source/blender/editors/asset/CMakeLists.txt +++ b/source/blender/editors/asset/CMakeLists.txt @@ -6,7 +6,6 @@ set(INC . ../include ../../asset_system - ../../blenloader ../../makesrna # dna_type_offsets.h ${CMAKE_CURRENT_BINARY_DIR}/../../makesdna/intern @@ -56,7 +55,7 @@ set(SRC set(LIB PRIVATE bf::blenkernel PRIVATE bf::blenlib - bf_blenloader + PRIVATE bf::blenloader PRIVATE bf::blentranslation PRIVATE bf::dna PRIVATE bf::intern::clog diff --git a/source/blender/editors/interface/CMakeLists.txt b/source/blender/editors/interface/CMakeLists.txt index ed18cdad0b2..a636038e5d8 100644 --- a/source/blender/editors/interface/CMakeLists.txt +++ b/source/blender/editors/interface/CMakeLists.txt @@ -7,7 +7,6 @@ set(INC ../asset ../include ../../asset_system - ../../blenloader ../../draw ../../functions ../../imbuf @@ -99,6 +98,7 @@ set(LIB PRIVATE bf::blenfont PRIVATE bf::blenkernel PRIVATE bf::blenlib + PRIVATE bf::blenloader PRIVATE bf::blentranslation PRIVATE bf::bmesh PRIVATE bf::depsgraph diff --git a/source/blender/editors/render/CMakeLists.txt b/source/blender/editors/render/CMakeLists.txt index 5f0212b6469..1d8b337fd6f 100644 --- a/source/blender/editors/render/CMakeLists.txt +++ b/source/blender/editors/render/CMakeLists.txt @@ -4,7 +4,6 @@ set(INC ../include - ../../blenloader ../../draw ../../imbuf ../../imbuf/movie @@ -34,6 +33,7 @@ set(SRC set(LIB PRIVATE bf::blenkernel PRIVATE bf::blenlib + PRIVATE bf::blenloader PRIVATE bf::blentranslation PRIVATE bf::bmesh PRIVATE bf::depsgraph diff --git a/source/blender/editors/screen/CMakeLists.txt b/source/blender/editors/screen/CMakeLists.txt index 62b09ac356a..a76ed258d83 100644 --- a/source/blender/editors/screen/CMakeLists.txt +++ b/source/blender/editors/screen/CMakeLists.txt @@ -6,7 +6,6 @@ set(INC ../asset ../include ../../asset_system - ../../blenloader ../../imbuf ../../makesrna ../../sequencer @@ -42,6 +41,7 @@ set(LIB PRIVATE bf::blenfont PRIVATE bf::blenkernel PRIVATE bf::blenlib + PRIVATE bf::blenloader PRIVATE bf::blentranslation PRIVATE bf::bmesh PRIVATE bf::depsgraph diff --git a/source/blender/editors/sculpt_paint/CMakeLists.txt b/source/blender/editors/sculpt_paint/CMakeLists.txt index aef372a3bb6..bf6ca5da0bb 100644 --- a/source/blender/editors/sculpt_paint/CMakeLists.txt +++ b/source/blender/editors/sculpt_paint/CMakeLists.txt @@ -10,7 +10,6 @@ set(INC ../uvedit ../../asset_system ../../blenlib - ../../blenloader ../../draw ../../functions ../../geometry @@ -178,6 +177,7 @@ set(LIB PRIVATE bf::blenkernel PRIVATE bf::animrig PRIVATE bf::blenlib + PRIVATE bf::blenloader PRIVATE bf::blentranslation PRIVATE bf::bmesh PRIVATE bf::depsgraph diff --git a/source/blender/editors/space_action/CMakeLists.txt b/source/blender/editors/space_action/CMakeLists.txt index 63e8f72bc2c..fb236c93ee6 100644 --- a/source/blender/editors/space_action/CMakeLists.txt +++ b/source/blender/editors/space_action/CMakeLists.txt @@ -4,7 +4,6 @@ set(INC ../include - ../../blenloader ../../makesrna ../../modifiers @@ -31,6 +30,7 @@ set(LIB PRIVATE bf::blenkernel PRIVATE bf::animrig PRIVATE bf::blenlib + PRIVATE bf::blenloader PRIVATE bf::blentranslation PRIVATE bf::depsgraph PRIVATE bf::dna diff --git a/source/blender/editors/space_buttons/CMakeLists.txt b/source/blender/editors/space_buttons/CMakeLists.txt index d3ce3b4627e..08ad313017e 100644 --- a/source/blender/editors/space_buttons/CMakeLists.txt +++ b/source/blender/editors/space_buttons/CMakeLists.txt @@ -4,7 +4,6 @@ set(INC ../include - ../../blenloader ../../makesrna # RNA_prototypes.hh @@ -26,6 +25,7 @@ set(SRC set(LIB PRIVATE bf::blenkernel PRIVATE bf::blenlib + PRIVATE bf::blenloader PRIVATE bf::blentranslation PRIVATE bf::bmesh PRIVATE bf::dna diff --git a/source/blender/editors/space_clip/CMakeLists.txt b/source/blender/editors/space_clip/CMakeLists.txt index dd288753d73..6846d54b718 100644 --- a/source/blender/editors/space_clip/CMakeLists.txt +++ b/source/blender/editors/space_clip/CMakeLists.txt @@ -4,7 +4,6 @@ set(INC ../include - ../../blenloader ../../imbuf ../../imbuf/movie ../../makesrna @@ -45,6 +44,7 @@ set(LIB PRIVATE bf::blenfont PRIVATE bf::blenkernel PRIVATE bf::blenlib + PRIVATE bf::blenloader PRIVATE bf::blentranslation PRIVATE bf::depsgraph PRIVATE bf::dna diff --git a/source/blender/editors/space_console/CMakeLists.txt b/source/blender/editors/space_console/CMakeLists.txt index a1581f96a8e..a4a03168d42 100644 --- a/source/blender/editors/space_console/CMakeLists.txt +++ b/source/blender/editors/space_console/CMakeLists.txt @@ -4,7 +4,6 @@ set(INC ../include - ../../blenloader ../../makesrna ) @@ -24,6 +23,7 @@ set(LIB PRIVATE bf::blenfont PRIVATE bf::blenkernel PRIVATE bf::blenlib + PRIVATE bf::blenloader PRIVATE bf::dna PRIVATE bf::gpu PRIVATE bf::intern::guardedalloc diff --git a/source/blender/editors/space_file/CMakeLists.txt b/source/blender/editors/space_file/CMakeLists.txt index af3faefd507..00424b39523 100644 --- a/source/blender/editors/space_file/CMakeLists.txt +++ b/source/blender/editors/space_file/CMakeLists.txt @@ -6,7 +6,6 @@ set(INC ../asset ../include ../../asset_system - ../../blenloader ../../imbuf ../../imbuf/movie ../../makesrna @@ -44,6 +43,7 @@ set(LIB PRIVATE bf::blenfont PRIVATE bf::blenkernel PRIVATE bf::blenlib + PRIVATE bf::blenloader PRIVATE bf::blentranslation PRIVATE bf::dna PRIVATE bf::gpu diff --git a/source/blender/editors/space_graph/CMakeLists.txt b/source/blender/editors/space_graph/CMakeLists.txt index a5bee274873..7734f38e625 100644 --- a/source/blender/editors/space_graph/CMakeLists.txt +++ b/source/blender/editors/space_graph/CMakeLists.txt @@ -4,7 +4,6 @@ set(INC ../include - ../../blenloader ../../makesrna # RNA_prototypes.hh @@ -31,6 +30,7 @@ set(SRC set(LIB PRIVATE bf::blenkernel PRIVATE bf::blenlib + PRIVATE bf::blenloader PRIVATE bf::blentranslation PRIVATE bf::depsgraph PRIVATE bf::dna diff --git a/source/blender/editors/space_image/CMakeLists.txt b/source/blender/editors/space_image/CMakeLists.txt index 5f1fd57331a..c3e7a72d376 100644 --- a/source/blender/editors/space_image/CMakeLists.txt +++ b/source/blender/editors/space_image/CMakeLists.txt @@ -5,7 +5,6 @@ set(INC ../asset ../include - ../../blenloader ../../draw ../../imbuf ../../imbuf/movie @@ -35,6 +34,7 @@ set(LIB PRIVATE bf::blenfont PRIVATE bf::blenkernel PRIVATE bf::blenlib + PRIVATE bf::blenloader PRIVATE bf::blentranslation PRIVATE bf::bmesh PRIVATE bf::depsgraph diff --git a/source/blender/editors/space_info/CMakeLists.txt b/source/blender/editors/space_info/CMakeLists.txt index 0ba84ccde11..97e5cab0f22 100644 --- a/source/blender/editors/space_info/CMakeLists.txt +++ b/source/blender/editors/space_info/CMakeLists.txt @@ -4,7 +4,6 @@ set(INC ../include - ../../blenloader ../../imbuf ../../makesrna @@ -31,6 +30,7 @@ set(LIB PRIVATE bf::blenfont PRIVATE bf::blenkernel PRIVATE bf::blenlib + PRIVATE bf::blenloader PRIVATE bf::blentranslation PRIVATE bf::bmesh PRIVATE bf::depsgraph diff --git a/source/blender/editors/space_nla/CMakeLists.txt b/source/blender/editors/space_nla/CMakeLists.txt index 4ed05009779..5a48d7da7bf 100644 --- a/source/blender/editors/space_nla/CMakeLists.txt +++ b/source/blender/editors/space_nla/CMakeLists.txt @@ -4,7 +4,6 @@ set(INC ../include - ../../blenloader ../../makesrna # RNA_prototypes.hh @@ -30,6 +29,7 @@ set(LIB PRIVATE bf::blenkernel PRIVATE bf::animrig PRIVATE bf::blenlib + PRIVATE bf::blenloader PRIVATE bf::blentranslation PRIVATE bf::depsgraph PRIVATE bf::dna diff --git a/source/blender/editors/space_node/CMakeLists.txt b/source/blender/editors/space_node/CMakeLists.txt index 255fb2a6938..1a8aac01334 100644 --- a/source/blender/editors/space_node/CMakeLists.txt +++ b/source/blender/editors/space_node/CMakeLists.txt @@ -6,7 +6,6 @@ set(INC ../include ../io ../../asset_system - ../../blenloader ../../compositor ../../draw ../../functions @@ -51,6 +50,7 @@ set(LIB PRIVATE bf::blenfont PRIVATE bf::blenkernel PRIVATE bf::blenlib + PRIVATE bf::blenloader PRIVATE bf::blentranslation PRIVATE bf::depsgraph PRIVATE bf::dna diff --git a/source/blender/editors/space_outliner/CMakeLists.txt b/source/blender/editors/space_outliner/CMakeLists.txt index 397b69c67b7..9df92ed831e 100644 --- a/source/blender/editors/space_outliner/CMakeLists.txt +++ b/source/blender/editors/space_outliner/CMakeLists.txt @@ -5,7 +5,6 @@ set(INC ../include ../../blenfont - ../../blenloader ../../imbuf ../../makesrna ../../sequencer @@ -133,6 +132,7 @@ set(LIB PRIVATE bf::animrig PRIVATE bf::blenkernel PRIVATE bf::blenlib + PRIVATE bf::blenloader PRIVATE bf::blentranslation PRIVATE bf::depsgraph PRIVATE bf::dna diff --git a/source/blender/editors/space_script/CMakeLists.txt b/source/blender/editors/space_script/CMakeLists.txt index ce48a35ff62..ffe6e0430c8 100644 --- a/source/blender/editors/space_script/CMakeLists.txt +++ b/source/blender/editors/space_script/CMakeLists.txt @@ -4,7 +4,6 @@ set(INC ../include - ../../blenloader ../../makesrna ) @@ -23,6 +22,7 @@ set(SRC set(LIB PRIVATE bf::blenkernel PRIVATE bf::blenlib + PRIVATE bf::blenloader PRIVATE bf::blentranslation PRIVATE bf::dna PRIVATE bf::gpu diff --git a/source/blender/editors/space_sequencer/CMakeLists.txt b/source/blender/editors/space_sequencer/CMakeLists.txt index 2931a3ecb8d..adccf4b1d48 100644 --- a/source/blender/editors/space_sequencer/CMakeLists.txt +++ b/source/blender/editors/space_sequencer/CMakeLists.txt @@ -4,7 +4,6 @@ set(INC ../include - ../../blenloader ../../draw ../../imbuf ../../imbuf/movie @@ -53,6 +52,7 @@ set(LIB PRIVATE bf::blenfont PRIVATE bf::blenkernel PRIVATE bf::blenlib + PRIVATE bf::blenloader PRIVATE bf::blentranslation PRIVATE bf::depsgraph PRIVATE bf::dna diff --git a/source/blender/editors/space_spreadsheet/CMakeLists.txt b/source/blender/editors/space_spreadsheet/CMakeLists.txt index 86e3ecaf29d..a006eb05ebe 100644 --- a/source/blender/editors/space_spreadsheet/CMakeLists.txt +++ b/source/blender/editors/space_spreadsheet/CMakeLists.txt @@ -4,7 +4,6 @@ set(INC ../include - ../../blenloader ../../functions ../../makesrna ../../nodes @@ -47,6 +46,7 @@ set(LIB PRIVATE bf::blenfont PRIVATE bf::blenkernel PRIVATE bf::blenlib + PRIVATE bf::blenloader PRIVATE bf::blentranslation PRIVATE bf::bmesh PRIVATE bf::depsgraph diff --git a/source/blender/editors/space_statusbar/CMakeLists.txt b/source/blender/editors/space_statusbar/CMakeLists.txt index 1b375ef2105..6b14d67253d 100644 --- a/source/blender/editors/space_statusbar/CMakeLists.txt +++ b/source/blender/editors/space_statusbar/CMakeLists.txt @@ -4,7 +4,6 @@ set(INC ../include - ../../blenloader ../../makesrna # RNA_prototypes.hh @@ -21,6 +20,7 @@ set(SRC set(LIB PRIVATE bf::blenkernel PRIVATE bf::blenlib + PRIVATE bf::blenloader PRIVATE bf::blentranslation PRIVATE bf::dna PRIVATE bf::gpu diff --git a/source/blender/editors/space_text/CMakeLists.txt b/source/blender/editors/space_text/CMakeLists.txt index 3b61f090453..79317339089 100644 --- a/source/blender/editors/space_text/CMakeLists.txt +++ b/source/blender/editors/space_text/CMakeLists.txt @@ -4,7 +4,6 @@ set(INC ../include - ../../blenloader ../../makesrna ) @@ -34,6 +33,7 @@ set(LIB PRIVATE bf::blenfont PRIVATE bf::blenkernel PRIVATE bf::blenlib + PRIVATE bf::blenloader PRIVATE bf::blentranslation PRIVATE bf::dna PRIVATE bf::gpu diff --git a/source/blender/editors/space_topbar/CMakeLists.txt b/source/blender/editors/space_topbar/CMakeLists.txt index fe7e610f8ba..59cff35662f 100644 --- a/source/blender/editors/space_topbar/CMakeLists.txt +++ b/source/blender/editors/space_topbar/CMakeLists.txt @@ -4,7 +4,6 @@ set(INC ../include - ../../blenloader ../../makesrna # RNA_prototypes.hh @@ -21,6 +20,7 @@ set(SRC set(LIB PRIVATE bf::blenkernel PRIVATE bf::blenlib + PRIVATE bf::blenloader PRIVATE bf::blentranslation PRIVATE bf::dna PRIVATE bf::gpu diff --git a/source/blender/editors/space_userpref/CMakeLists.txt b/source/blender/editors/space_userpref/CMakeLists.txt index a3cad4a0ddb..9792e2cac5f 100644 --- a/source/blender/editors/space_userpref/CMakeLists.txt +++ b/source/blender/editors/space_userpref/CMakeLists.txt @@ -5,7 +5,6 @@ set(INC ../include ../../asset_system - ../../blenloader ../../makesrna # RNA_prototypes.hh @@ -26,6 +25,7 @@ set(SRC set(LIB PRIVATE bf::blenkernel PRIVATE bf::blenlib + PRIVATE bf::blenloader PRIVATE bf::blentranslation PRIVATE bf::dna PRIVATE bf::extern::fmtlib diff --git a/source/blender/editors/space_view3d/CMakeLists.txt b/source/blender/editors/space_view3d/CMakeLists.txt index 7350b9f3c39..b128f70b436 100644 --- a/source/blender/editors/space_view3d/CMakeLists.txt +++ b/source/blender/editors/space_view3d/CMakeLists.txt @@ -6,7 +6,6 @@ set(INC ../asset ../include ../../asset_system - ../../blenloader ../../draw ../../functions ../../imbuf @@ -81,6 +80,7 @@ set(LIB PRIVATE bf::blenfont PRIVATE bf::blenkernel PRIVATE bf::blenlib + PRIVATE bf::blenloader PRIVATE bf::blentranslation PRIVATE bf::bmesh PRIVATE bf::depsgraph diff --git a/source/blender/editors/undo/CMakeLists.txt b/source/blender/editors/undo/CMakeLists.txt index 0a0b5596f5c..2e702c85e0f 100644 --- a/source/blender/editors/undo/CMakeLists.txt +++ b/source/blender/editors/undo/CMakeLists.txt @@ -5,7 +5,6 @@ set(INC ../include ../../asset_system - ../../blenloader ../../makesrna ) @@ -23,6 +22,7 @@ set(SRC set(LIB PRIVATE bf::blenkernel PRIVATE bf::blenlib + PRIVATE bf::blenloader PRIVATE bf::blentranslation PRIVATE bf::bmesh PRIVATE bf::dna diff --git a/source/blender/imbuf/CMakeLists.txt b/source/blender/imbuf/CMakeLists.txt index 78eeec50fc3..94266565cf4 100644 --- a/source/blender/imbuf/CMakeLists.txt +++ b/source/blender/imbuf/CMakeLists.txt @@ -7,7 +7,6 @@ add_subdirectory(movie) set(INC . ./movie - ../blenloader ../makesrna ../sequencer ../../../intern/memutil @@ -73,7 +72,7 @@ set(SRC set(LIB PRIVATE bf::blenkernel PRIVATE bf::blenlib - bf_blenloader + PRIVATE bf::blenloader PRIVATE bf::dna PRIVATE bf::gpu bf_imbuf_openimageio diff --git a/source/blender/io/alembic/CMakeLists.txt b/source/blender/io/alembic/CMakeLists.txt index 5f623592f7f..0bfe03278a1 100644 --- a/source/blender/io/alembic/CMakeLists.txt +++ b/source/blender/io/alembic/CMakeLists.txt @@ -5,7 +5,6 @@ set(INC . ../common - ../../blenloader ../../editors/include ../../makesrna ../../../../intern/utfconv @@ -82,6 +81,7 @@ set(SRC set(LIB PRIVATE bf::blenkernel PRIVATE bf::blenlib + PRIVATE bf::blenloader PRIVATE bf::blentranslation PRIVATE bf::bmesh PRIVATE bf::depsgraph diff --git a/source/blender/io/grease_pencil/CMakeLists.txt b/source/blender/io/grease_pencil/CMakeLists.txt index 415ff55d1d3..3782c43660a 100644 --- a/source/blender/io/grease_pencil/CMakeLists.txt +++ b/source/blender/io/grease_pencil/CMakeLists.txt @@ -5,7 +5,6 @@ set(INC . ../common - ../../blenloader ../../editors/include ../../functions ../../geometry @@ -30,6 +29,7 @@ set(SRC set(LIB PRIVATE bf::blenkernel PRIVATE bf::blenlib + PRIVATE bf::blenloader PRIVATE bf::bmesh PRIVATE bf::depsgraph PRIVATE bf::dna diff --git a/source/blender/io/usd/CMakeLists.txt b/source/blender/io/usd/CMakeLists.txt index 0bbf1aca0f1..dc4b9ea9408 100644 --- a/source/blender/io/usd/CMakeLists.txt +++ b/source/blender/io/usd/CMakeLists.txt @@ -44,7 +44,6 @@ endif() set(INC . ../common - ../../blenloader ../../editors/include ../../imbuf ../../makesrna @@ -193,6 +192,7 @@ endif() set(LIB PRIVATE bf::blenkernel PRIVATE bf::blenlib + PRIVATE bf::blenloader PRIVATE bf::blentranslation PRIVATE bf::bmesh PRIVATE bf::depsgraph diff --git a/source/blender/modifiers/CMakeLists.txt b/source/blender/modifiers/CMakeLists.txt index 4bd2d075b8e..ccfdddccbeb 100644 --- a/source/blender/modifiers/CMakeLists.txt +++ b/source/blender/modifiers/CMakeLists.txt @@ -6,7 +6,6 @@ set(INC . intern intern/lineart - ../blenloader ../editors/include ../functions ../geometry @@ -139,6 +138,7 @@ set(LIB PRIVATE bf::blenfont PRIVATE bf::blenkernel PRIVATE bf::blenlib + PRIVATE bf::blenloader PRIVATE bf::blentranslation PRIVATE bf::bmesh PRIVATE bf::depsgraph diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt index 8aa5beac023..2b7414d4735 100644 --- a/source/blender/nodes/CMakeLists.txt +++ b/source/blender/nodes/CMakeLists.txt @@ -55,7 +55,6 @@ set(INC texture ../animrig ../editors/include - ../blenloader ../depsgraph ../functions ../geometry @@ -138,6 +137,7 @@ set(SRC set(LIB PRIVATE bf::blenkernel PRIVATE bf::blenlib + PRIVATE bf::blenloader PRIVATE bf::blentranslation PRIVATE bf::bmesh PRIVATE bf::depsgraph diff --git a/source/blender/nodes/geometry/CMakeLists.txt b/source/blender/nodes/geometry/CMakeLists.txt index e9a1ab36a28..70446fe57a1 100644 --- a/source/blender/nodes/geometry/CMakeLists.txt +++ b/source/blender/nodes/geometry/CMakeLists.txt @@ -8,7 +8,6 @@ set(INC include ../intern ../../editors/include - ../../blenloader ../../functions ../../geometry ../../imbuf @@ -245,6 +244,7 @@ set(SRC set(LIB PRIVATE bf::blenkernel PRIVATE bf::blenlib + PRIVATE bf::blenloader PRIVATE bf::blentranslation PRIVATE bf::bmesh PRIVATE bf::depsgraph diff --git a/source/blender/python/intern/CMakeLists.txt b/source/blender/python/intern/CMakeLists.txt index cb8409d1afd..90589166b5b 100644 --- a/source/blender/python/intern/CMakeLists.txt +++ b/source/blender/python/intern/CMakeLists.txt @@ -4,7 +4,6 @@ set(INC .. - ../../blenloader ../../editors/include ../../imbuf ../../imbuf/intern/oiio @@ -118,6 +117,7 @@ set(SRC set(LIB PRIVATE bf::blenkernel PRIVATE bf::blenlib + PRIVATE bf::blenloader PRIVATE bf::blentranslation PRIVATE bf::depsgraph PRIVATE bf::dna diff --git a/source/blender/sequencer/CMakeLists.txt b/source/blender/sequencer/CMakeLists.txt index ce69b33767c..addedc5a2ba 100644 --- a/source/blender/sequencer/CMakeLists.txt +++ b/source/blender/sequencer/CMakeLists.txt @@ -6,7 +6,6 @@ set(INC . intern ../animrig - ../blenloader ../imbuf ../imbuf/movie ../makesrna @@ -84,6 +83,7 @@ set(LIB PRIVATE bf::blenfont PRIVATE bf::blenkernel PRIVATE bf::blenlib + PRIVATE bf::blenloader PRIVATE bf::blentranslation PRIVATE bf::depsgraph PRIVATE bf::dna diff --git a/source/blender/windowmanager/CMakeLists.txt b/source/blender/windowmanager/CMakeLists.txt index 8906ac4fc67..24bf7c77249 100644 --- a/source/blender/windowmanager/CMakeLists.txt +++ b/source/blender/windowmanager/CMakeLists.txt @@ -7,7 +7,6 @@ set(INC gizmo gizmo/intern ../asset_system - ../blenloader ../compositor ../editors/include ../draw @@ -96,6 +95,7 @@ set(LIB PRIVATE bf::blenfont PRIVATE bf::blenkernel PRIVATE bf::blenlib + PRIVATE bf::blenloader PRIVATE bf::blentranslation PRIVATE bf::bmesh PRIVATE bf::depsgraph