CMake: Fix Compiling Shader Builder on macOS

Due to changes in the build environment shader_builder wasn't able to
compile on macOs. This patch reverts several recent changes to CMake files.

* dbb2844ed9
* 94817f64b9
* 1b6cd937ff

The idea is that in the near future shader_builder will run on the buildbot as
part of any regular build to ensure that changes to the CMake doesn't break
shader_builder and we only detect it after a few days.

Pull Request: https://projects.blender.org/blender/blender/pulls/115929
This commit is contained in:
Jeroen Bakker
2023-12-08 15:47:14 +01:00
parent f355575f1d
commit 65e58fe574
59 changed files with 88 additions and 81 deletions

View File

@@ -7,6 +7,7 @@ set(INC
../../blenkernel
../../editors/include
../../gpu
../../imbuf
)
set(INC_SYS
@@ -61,7 +62,6 @@ set(LIB
${PYTHON_LIBRARIES}
PRIVATE bf::blenlib
PRIVATE bf::dna
PRIVATE bf::imbuf
PRIVATE bf::intern::guardedalloc
)

View File

@@ -9,6 +9,7 @@ set(INC
../../blentranslation
../../editors/include
../../gpu
../../imbuf
../../imbuf/intern/oiio
../../makesrna
../../windowmanager
@@ -123,7 +124,6 @@ set(LIB
bf_editor_animation
bf_editor_interface
bf_editor_space_api
PRIVATE bf::imbuf
PRIVATE bf::intern::clog
PRIVATE bf::intern::guardedalloc
PRIVATE bf::animrig

View File

@@ -6,6 +6,7 @@ set(INC
.
../../blenkernel
../../bmesh
../../imbuf
)
set(INC_SYS
@@ -42,7 +43,7 @@ set(LIB
PRIVATE bf::blenlib
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::imbuf
bf_imbuf
PRIVATE bf::intern::guardedalloc
bf_python_ext