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 :19422044eda670b53abe0f541db97cbe516e8c813e88a2f44c4e64b772f59547e7a31707fe6c5a57The problematic commit was07fe6c5a57as 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:
@@ -3,7 +3,8 @@
|
||||
# SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
set(INC
|
||||
PUBLIC .
|
||||
.
|
||||
../atomic
|
||||
)
|
||||
|
||||
set(INC_SYS
|
||||
@@ -18,12 +19,9 @@ set(SRC
|
||||
|
||||
set(LIB
|
||||
PRIVATE bf::intern::guardedalloc
|
||||
PRIVATE bf::intern::atomic
|
||||
)
|
||||
|
||||
blender_add_lib(bf_intern_clog "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
|
||||
|
||||
# Disabled for makesdna/makesrna.
|
||||
target_compile_definitions(bf_intern_clog PRIVATE WITH_CLOG_PTHREADS)
|
||||
add_definitions(-DWITH_CLOG_PTHREADS)
|
||||
|
||||
add_library(bf::intern::clog ALIAS bf_intern_clog)
|
||||
blender_add_lib(bf_intern_clog "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
|
||||
|
||||
Reference in New Issue
Block a user