CMake: revert last weeks modernizations

The cleanup of blenkernel last weeks , caused the house of cards to
collapse on  top of bf_gpu's shader_builder, which is off by default
but used on a daily basis by the rendering team.

Given the fixes forward in #110394 ran into a ODR violation in OSL that
was hiding there for years, I don't see another way forward without
impeding the rendering teams productivity for "quite a while" as there
is no guarantee the OSL issue would be the end of it.

the only way forward appears to be back.

this reverts :

19422044ed
a670b53abe
0f541db97c
be516e8c81
3e88a2f44c
4e64b772f5
9547e7a317
07fe6c5a57

The problematic commit was 07fe6c5a57
as blenkernel links most of blender, it's a bit of a link order issue
magnet. Given all these commits stack, it's near impossible to revert
just that one without spending a significant amount of time resolving
merge conflicts. 99% of that work was automated, so easier to just
revert all of them, and re-do the work, than it is to deal with the
merge conflicts.

Pull Request: https://projects.blender.org/blender/blender/pulls/110438
This commit is contained in:
Ray molenkamp
2023-07-25 16:43:21 +02:00
parent 9d0907560a
commit 4ea2baf4ae
95 changed files with 470 additions and 410 deletions

View File

@@ -4,6 +4,9 @@
set(INC
.
../../blenkernel
../../bmesh
../../depsgraph
)
set(INC_SYS
@@ -33,10 +36,8 @@ set(SRC
)
set(LIB
PRIVATE bf::blenkernel
bf_blenkernel
PRIVATE bf::blenlib
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc
bf_python_mathutils

View File

@@ -4,8 +4,10 @@
set(INC
.
../../blenkernel
../../gpu
../../makesrna
../../../../intern/clog
)
set(INC_SYS
@@ -41,10 +43,8 @@ set(LIB
${Epoxy_LIBRARIES}
${PYTHON_LINKFLAGS}
${PYTHON_LIBRARIES}
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::dna
PRIVATE bf::intern::clog
PRIVATE bf::intern::guardedalloc
)

View File

@@ -4,6 +4,7 @@
set(INC
.
../../blenkernel
../../editors/include
../../gpu
../../imbuf
@@ -59,7 +60,6 @@ set(LIB
${Epoxy_LIBRARIES}
${PYTHON_LINKFLAGS}
${PYTHON_LIBRARIES}
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::dna
PRIVATE bf::intern::guardedalloc

View File

@@ -4,12 +4,17 @@
set(INC
..
../../blenkernel
../../blenloader
../../blentranslation
../../depsgraph
../../editors/include
../../gpu
../../imbuf
../../imbuf/intern/oiio
../../makesrna
../../windowmanager
../../../../intern/clog
../../../../intern/mantaflow/extern
../../../../intern/opencolorio
# RNA_prototypes.h
@@ -115,21 +120,16 @@ set(SRC
)
set(LIB
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::blentranslation
PRIVATE bf::depsgraph
PRIVATE bf::dna
bf_editor_animation
bf_editor_interface
bf_editor_space_api
PRIVATE bf::intern::clog
PRIVATE bf::intern::guardedalloc
bf_python_gpu
${PYTHON_LINKFLAGS}
${PYTHON_LIBRARIES}
PRIVATE bf::windowmanager
)
# only to check if buildinfo is available

View File

@@ -4,6 +4,9 @@
set(INC
.
../../blenkernel
../../bmesh
../../depsgraph
../../imbuf
)
@@ -38,10 +41,7 @@ set(SRC
)
set(LIB
PRIVATE bf::blenkernel
PRIVATE bf::blenlib
PRIVATE bf::bmesh
PRIVATE bf::depsgraph
PRIVATE bf::dna
bf_imbuf
PRIVATE bf::intern::guardedalloc