diff --git a/intern/cycles/blender/CMakeLists.txt b/intern/cycles/blender/CMakeLists.txt index e16d97b2638..986e49b627d 100644 --- a/intern/cycles/blender/CMakeLists.txt +++ b/intern/cycles/blender/CMakeLists.txt @@ -6,7 +6,6 @@ set(INC .. ../../mikktspace ../../../source/blender/makesrna - ../../../source/blender/render ${CMAKE_BINARY_DIR}/source/blender/makesrna/intern ) @@ -61,6 +60,7 @@ set(LIB PRIVATE bf::dna PRIVATE bf::gpu PRIVATE bf::intern::guardedalloc + PRIVATE bf::render cycles_bvh cycles_device cycles_graph diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt index bc9d818353f..1acd5929c21 100644 --- a/source/blender/blenkernel/CMakeLists.txt +++ b/source/blender/blenkernel/CMakeLists.txt @@ -11,7 +11,6 @@ set(INC ../modifiers ../nodes ../nodes/geometry/include - ../render ../sequencer ../shader_fx ../simulation @@ -575,6 +574,7 @@ set(LIB bf_intern_opensubdiv # Uses stub when disabled. bf_modifiers bf_nodes + PRIVATE bf::render bf_rna bf_shader_fx bf_simulation diff --git a/source/blender/blenloader/CMakeLists.txt b/source/blender/blenloader/CMakeLists.txt index ced7a1cbbca..613bf71080f 100644 --- a/source/blender/blenloader/CMakeLists.txt +++ b/source/blender/blenloader/CMakeLists.txt @@ -9,7 +9,6 @@ set(INC ../imbuf/movie ../makesrna ../nodes - ../render ../sequencer # RNA_prototypes.hh @@ -66,6 +65,7 @@ set(LIB PRIVATE bf::intern::guardedalloc PRIVATE bf::extern::fmtlib PRIVATE bf::intern::memutil + PRIVATE bf::render PRIVATE bf::windowmanager ) diff --git a/source/blender/compositor/CMakeLists.txt b/source/blender/compositor/CMakeLists.txt index efc0eab29b7..4e3b383b3a0 100644 --- a/source/blender/compositor/CMakeLists.txt +++ b/source/blender/compositor/CMakeLists.txt @@ -10,7 +10,6 @@ set(INC ../gpu/intern ../makesrna ../nodes - ../render ../render/intern ) @@ -148,7 +147,7 @@ set(LIB PRIVATE bf::functions PRIVATE bf::gpu PRIVATE bf::imbuf - bf_render + PRIVATE bf::render PRIVATE bf::blenlib PRIVATE bf::dna PRIVATE bf::intern::guardedalloc diff --git a/source/blender/draw/CMakeLists.txt b/source/blender/draw/CMakeLists.txt index feec95912ce..d9e8e70fbfd 100644 --- a/source/blender/draw/CMakeLists.txt +++ b/source/blender/draw/CMakeLists.txt @@ -11,7 +11,6 @@ set(INC ../gpu/intern ../makesrna ../nodes - ../render ../render/intern ../compositor ../compositor/algorithms @@ -310,6 +309,7 @@ set(LIB PRIVATE bf::intern::clog PRIVATE bf::intern::guardedalloc bf_compositor + PRIVATE bf::render PRIVATE bf::windowmanager PRIVATE bf::intern::atomic PRIVATE bf::extern::fmtlib diff --git a/source/blender/editors/interface/CMakeLists.txt b/source/blender/editors/interface/CMakeLists.txt index 05520321767..a59e7db0ca7 100644 --- a/source/blender/editors/interface/CMakeLists.txt +++ b/source/blender/editors/interface/CMakeLists.txt @@ -12,7 +12,6 @@ set(INC ../../makesrna ../../nodes ../../python - ../../render ../../../../intern/ghost # RNA_prototypes.hh ${CMAKE_BINARY_DIR}/source/blender/makesrna @@ -109,6 +108,7 @@ set(LIB PRIVATE bf::imbuf PRIVATE bf::intern::guardedalloc PRIVATE bf::animrig + PRIVATE bf::render PRIVATE bf::windowmanager ) diff --git a/source/blender/editors/lattice/CMakeLists.txt b/source/blender/editors/lattice/CMakeLists.txt index 061c8b029d1..e88878c6e2f 100644 --- a/source/blender/editors/lattice/CMakeLists.txt +++ b/source/blender/editors/lattice/CMakeLists.txt @@ -5,7 +5,6 @@ set(INC ../include ../../makesrna - ../../render ) set(INC_SYS @@ -28,6 +27,7 @@ set(LIB PRIVATE bf::dna PRIVATE bf::intern::clog PRIVATE bf::intern::guardedalloc + PRIVATE bf::render PRIVATE bf::windowmanager ) diff --git a/source/blender/editors/mesh/CMakeLists.txt b/source/blender/editors/mesh/CMakeLists.txt index 7667c2eb9e7..21bb251f182 100644 --- a/source/blender/editors/mesh/CMakeLists.txt +++ b/source/blender/editors/mesh/CMakeLists.txt @@ -8,7 +8,6 @@ set(INC ../../draw ../../geometry ../../makesrna - ../../render # RNA_prototypes.hh ${CMAKE_BINARY_DIR}/source/blender/makesrna ) @@ -68,6 +67,7 @@ set(LIB PRIVATE bf::imbuf PRIVATE bf::intern::clog PRIVATE bf::intern::guardedalloc + PRIVATE bf::render PRIVATE bf::windowmanager ) diff --git a/source/blender/editors/metaball/CMakeLists.txt b/source/blender/editors/metaball/CMakeLists.txt index 41b7a0d08ba..1e58d40cb77 100644 --- a/source/blender/editors/metaball/CMakeLists.txt +++ b/source/blender/editors/metaball/CMakeLists.txt @@ -5,7 +5,6 @@ set(INC ../include ../../makesrna - ../../render ) set(INC_SYS @@ -29,6 +28,7 @@ set(LIB PRIVATE bf::gpu PRIVATE bf::intern::clog PRIVATE bf::intern::guardedalloc + PRIVATE bf::render PRIVATE bf::windowmanager ) diff --git a/source/blender/editors/object/CMakeLists.txt b/source/blender/editors/object/CMakeLists.txt index db1ce4cbf6d..d4fcac34005 100644 --- a/source/blender/editors/object/CMakeLists.txt +++ b/source/blender/editors/object/CMakeLists.txt @@ -10,7 +10,6 @@ set(INC ../../makesrna ../../modifiers ../../python - ../../render ../../shader_fx # RNA_prototypes.hh @@ -70,7 +69,7 @@ set(LIB PRIVATE bf::imbuf PRIVATE bf::intern::clog PRIVATE bf::intern::guardedalloc - bf_render + PRIVATE bf::render PRIVATE bf::windowmanager ) diff --git a/source/blender/editors/render/CMakeLists.txt b/source/blender/editors/render/CMakeLists.txt index ea4cf9541ab..7916cdd9644 100644 --- a/source/blender/editors/render/CMakeLists.txt +++ b/source/blender/editors/render/CMakeLists.txt @@ -8,7 +8,6 @@ set(INC ../../imbuf/movie ../../makesrna ../../nodes - ../../render ../../sequencer # RNA_prototypes.hh ${CMAKE_BINARY_DIR}/source/blender/makesrna @@ -42,6 +41,7 @@ set(LIB PRIVATE bf::imbuf PRIVATE bf::intern::guardedalloc PRIVATE bf::animrig + PRIVATE bf::render PRIVATE bf::windowmanager ) diff --git a/source/blender/editors/sculpt_paint/CMakeLists.txt b/source/blender/editors/sculpt_paint/CMakeLists.txt index 35c1ff49539..5c658931080 100644 --- a/source/blender/editors/sculpt_paint/CMakeLists.txt +++ b/source/blender/editors/sculpt_paint/CMakeLists.txt @@ -14,7 +14,6 @@ set(INC ../../geometry ../../makesrna ../../nodes - ../../render ../../../../intern/eigen # RNA_prototypes.hh ${CMAKE_BINARY_DIR}/source/blender/makesrna @@ -187,6 +186,7 @@ set(LIB PRIVATE bf::intern::atomic PRIVATE bf::intern::clog PRIVATE bf::intern::guardedalloc + PRIVATE bf::render PRIVATE bf::windowmanager ) diff --git a/source/blender/editors/space_file/CMakeLists.txt b/source/blender/editors/space_file/CMakeLists.txt index d54b8b0316a..9ed2213a8dc 100644 --- a/source/blender/editors/space_file/CMakeLists.txt +++ b/source/blender/editors/space_file/CMakeLists.txt @@ -8,7 +8,6 @@ set(INC ../../asset_system ../../imbuf/movie ../../makesrna - ../../render # RNA_prototypes.hh ${CMAKE_BINARY_DIR}/source/blender/makesrna @@ -50,6 +49,7 @@ set(LIB PRIVATE bf::intern::guardedalloc PRIVATE bf::extern::fmtlib PRIVATE bf::intern::atomic + PRIVATE bf::render PRIVATE bf::windowmanager ) diff --git a/source/blender/editors/space_image/CMakeLists.txt b/source/blender/editors/space_image/CMakeLists.txt index d40fdee7667..7a1d8d4f108 100644 --- a/source/blender/editors/space_image/CMakeLists.txt +++ b/source/blender/editors/space_image/CMakeLists.txt @@ -8,7 +8,6 @@ set(INC ../../draw ../../imbuf/movie ../../makesrna - ../../render # RNA_prototypes.hh ${CMAKE_BINARY_DIR}/source/blender/makesrna @@ -43,6 +42,7 @@ set(LIB PRIVATE bf::imbuf PRIVATE bf::intern::clog PRIVATE bf::intern::guardedalloc + PRIVATE bf::render PRIVATE bf::windowmanager ) diff --git a/source/blender/editors/space_node/CMakeLists.txt b/source/blender/editors/space_node/CMakeLists.txt index f9085ed9e56..c3d44036708 100644 --- a/source/blender/editors/space_node/CMakeLists.txt +++ b/source/blender/editors/space_node/CMakeLists.txt @@ -11,7 +11,6 @@ set(INC ../../geometry ../../makesrna ../../nodes - ../../render # RNA_prototypes.hh ${CMAKE_BINARY_DIR}/source/blender/makesrna @@ -59,6 +58,7 @@ set(LIB PRIVATE bf::intern::guardedalloc bf_compositor PRIVATE bf::extern::fmtlib + PRIVATE bf::render PRIVATE bf::windowmanager ) diff --git a/source/blender/editors/space_view3d/CMakeLists.txt b/source/blender/editors/space_view3d/CMakeLists.txt index 983e33eaca3..24306ed0e73 100644 --- a/source/blender/editors/space_view3d/CMakeLists.txt +++ b/source/blender/editors/space_view3d/CMakeLists.txt @@ -10,7 +10,6 @@ set(INC ../../makesrna ../../modifiers ../../nodes - ../../render ../../../../intern/mantaflow/extern # RNA_prototypes.hh @@ -90,6 +89,7 @@ set(LIB PRIVATE bf::gpu PRIVATE bf::imbuf PRIVATE bf::intern::guardedalloc + PRIVATE bf::render PRIVATE bf::windowmanager ) diff --git a/source/blender/editors/transform/CMakeLists.txt b/source/blender/editors/transform/CMakeLists.txt index 822d269e8dd..73309e86c53 100644 --- a/source/blender/editors/transform/CMakeLists.txt +++ b/source/blender/editors/transform/CMakeLists.txt @@ -6,7 +6,6 @@ set(INC ../include ../../ikplugin ../../makesrna - ../../render ../../sequencer # RNA_prototypes.hh ${CMAKE_BINARY_DIR}/source/blender/makesrna @@ -119,6 +118,7 @@ set(LIB bf_editor_mask PRIVATE bf::gpu PRIVATE bf::intern::guardedalloc + PRIVATE bf::render PRIVATE bf::windowmanager ) diff --git a/source/blender/freestyle/CMakeLists.txt b/source/blender/freestyle/CMakeLists.txt index c60e4178308..37d1674c852 100644 --- a/source/blender/freestyle/CMakeLists.txt +++ b/source/blender/freestyle/CMakeLists.txt @@ -541,6 +541,7 @@ set(LIB ${PYTHON_LINKFLAGS} ${PYTHON_LIBRARIES} + PRIVATE bf::render ) set(INC @@ -548,7 +549,6 @@ set(INC ../makesrna ../python ../python/intern - ../render ../render/intern # RNA_prototypes.hh diff --git a/source/blender/modifiers/CMakeLists.txt b/source/blender/modifiers/CMakeLists.txt index f2439992328..89e5530ffae 100644 --- a/source/blender/modifiers/CMakeLists.txt +++ b/source/blender/modifiers/CMakeLists.txt @@ -10,7 +10,6 @@ set(INC ../geometry ../makesrna ../nodes - ../render ../../../intern/eigen # RNA_prototypes.hh @@ -145,6 +144,7 @@ set(LIB PRIVATE bf::functions PRIVATE bf::intern::guardedalloc PRIVATE bf::extern::fmtlib + PRIVATE bf::render PRIVATE bf::windowmanager ) diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt index 57b41345f66..266d2a62960 100644 --- a/source/blender/nodes/CMakeLists.txt +++ b/source/blender/nodes/CMakeLists.txt @@ -59,7 +59,6 @@ set(INC ../geometry ../makesrna ../modifiers - ../render # RNA_prototypes.hh ${CMAKE_BINARY_DIR}/source/blender/makesrna @@ -151,6 +150,7 @@ set(LIB bf_nodes_texture PRIVATE bf::extern::fmtlib PRIVATE bf::extern::xxhash + PRIVATE bf::render PRIVATE bf::windowmanager ) diff --git a/source/blender/nodes/composite/CMakeLists.txt b/source/blender/nodes/composite/CMakeLists.txt index 0e4d80fef0c..9fc626db85b 100644 --- a/source/blender/nodes/composite/CMakeLists.txt +++ b/source/blender/nodes/composite/CMakeLists.txt @@ -8,7 +8,6 @@ set(INC ../intern ../../editors/include ../../makesrna - ../../render ../../compositor ../../compositor/algorithms ../../compositor/cached_resources @@ -132,6 +131,7 @@ set(LIB PRIVATE bf::intern::guardedalloc PRIVATE bf::extern::fmtlib bf_compositor + PRIVATE bf::render PRIVATE bf::windowmanager ) diff --git a/source/blender/nodes/geometry/CMakeLists.txt b/source/blender/nodes/geometry/CMakeLists.txt index 05b680a854f..72e85cbb8f1 100644 --- a/source/blender/nodes/geometry/CMakeLists.txt +++ b/source/blender/nodes/geometry/CMakeLists.txt @@ -12,7 +12,6 @@ set(INC ../../imbuf/movie ../../makesrna ../../modifiers - ../../render ../../io/common ../../io/ply ../../io/stl @@ -256,6 +255,7 @@ set(LIB PRIVATE bf::intern::atomic PRIVATE bf::extern::fmtlib PRIVATE bf::extern::xxhash + PRIVATE bf::render PRIVATE bf::windowmanager ) diff --git a/source/blender/nodes/shader/CMakeLists.txt b/source/blender/nodes/shader/CMakeLists.txt index b69a9d4cb50..0ab471a631b 100644 --- a/source/blender/nodes/shader/CMakeLists.txt +++ b/source/blender/nodes/shader/CMakeLists.txt @@ -8,7 +8,6 @@ set(INC ../intern ../../editors/include ../../makesrna - ../../render ../../../../intern/sky/include # RNA_prototypes.hh ${CMAKE_BINARY_DIR}/source/blender/makesrna @@ -135,6 +134,7 @@ set(LIB PRIVATE bf::intern::guardedalloc bf_intern_sky bf_nodes + PRIVATE bf::render PRIVATE bf::windowmanager ) diff --git a/source/blender/nodes/texture/CMakeLists.txt b/source/blender/nodes/texture/CMakeLists.txt index 467c8d13a8b..c33ae17f1d9 100644 --- a/source/blender/nodes/texture/CMakeLists.txt +++ b/source/blender/nodes/texture/CMakeLists.txt @@ -8,7 +8,6 @@ set(INC ../intern ../../editors/include ../../makesrna - ../../render # RNA_prototypes.hh ${CMAKE_BINARY_DIR}/source/blender/makesrna ) @@ -61,6 +60,7 @@ set(LIB PRIVATE bf::imbuf PRIVATE bf::intern::guardedalloc bf_nodes + PRIVATE bf::render PRIVATE bf::windowmanager ) diff --git a/source/blender/render/CMakeLists.txt b/source/blender/render/CMakeLists.txt index 44168bb78d2..5987eb72abe 100644 --- a/source/blender/render/CMakeLists.txt +++ b/source/blender/render/CMakeLists.txt @@ -4,7 +4,7 @@ set(INC - . + PUBLIC . intern ../compositor ../compositor/cached_resources @@ -99,3 +99,4 @@ if(WITH_HYDRA) endif() blender_add_lib_nolist(bf_render "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") +add_library(bf::render ALIAS bf_render) diff --git a/source/blender/sequencer/CMakeLists.txt b/source/blender/sequencer/CMakeLists.txt index 6effa9c4bdd..8eddc0b190a 100644 --- a/source/blender/sequencer/CMakeLists.txt +++ b/source/blender/sequencer/CMakeLists.txt @@ -8,7 +8,6 @@ set(INC ../animrig ../imbuf/movie ../makesrna - ../render # RNA_prototypes.hh ${CMAKE_BINARY_DIR}/source/blender/makesrna @@ -90,6 +89,7 @@ set(LIB PRIVATE bf::intern::atomic PRIVATE bf::intern::clog PRIVATE bf::intern::guardedalloc + PRIVATE bf::render PRIVATE bf::windowmanager ) diff --git a/source/blender/shader_fx/CMakeLists.txt b/source/blender/shader_fx/CMakeLists.txt index 4518bc88cc6..15924c9cad4 100644 --- a/source/blender/shader_fx/CMakeLists.txt +++ b/source/blender/shader_fx/CMakeLists.txt @@ -7,7 +7,6 @@ set(INC intern ../editors/include ../makesrna - ../render ../../../intern/eigen # RNA_prototypes.hh ${CMAKE_BINARY_DIR}/source/blender/makesrna @@ -45,6 +44,7 @@ set(LIB PRIVATE bf::depsgraph PRIVATE bf::dna PRIVATE bf::intern::guardedalloc + PRIVATE bf::render PRIVATE bf::windowmanager ) diff --git a/source/blender/windowmanager/CMakeLists.txt b/source/blender/windowmanager/CMakeLists.txt index b39450ffee8..82d7210907b 100644 --- a/source/blender/windowmanager/CMakeLists.txt +++ b/source/blender/windowmanager/CMakeLists.txt @@ -13,7 +13,6 @@ set(INC ../imbuf/movie ../makesrna ../nodes - ../render ../sequencer ../../../intern/memutil @@ -107,6 +106,7 @@ set(LIB PRIVATE bf::intern::clog PRIVATE bf::intern::guardedalloc PRIVATE bf::animrig + PRIVATE bf::render bf_sequencer bf_intern_ghost bf_compositor diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 567b2f646ce..e90f4d0f4b4 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -7,7 +7,6 @@ set(INC ../blender/imbuf/movie ../blender/io/usd ../blender/makesrna - ../blender/render ) set(LIB @@ -20,6 +19,7 @@ set(LIB PRIVATE bf::imbuf PRIVATE bf::intern::clog PRIVATE bf::intern::guardedalloc + PRIVATE bf::render PRIVATE bf::windowmanager )