4ea2baf4ae
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
47 lines
718 B
CMake
47 lines
718 B
CMake
# SPDX-FileCopyrightText: 2014 Blender Foundation
|
|
#
|
|
# SPDX-License-Identifier: GPL-2.0-or-later
|
|
|
|
set(INC
|
|
.
|
|
intern
|
|
../blenkernel
|
|
../depsgraph
|
|
../functions
|
|
../imbuf
|
|
../makesrna
|
|
../nodes
|
|
)
|
|
|
|
set(INC_SYS
|
|
${EIGEN3_INCLUDE_DIRS}
|
|
)
|
|
|
|
set(SRC
|
|
intern/SIM_mass_spring.cc
|
|
intern/hair_volume.cc
|
|
intern/implicit_blender.cc
|
|
intern/implicit_eigen.cc
|
|
|
|
intern/ConstrainedConjugateGradient.h
|
|
intern/eigen_utils.h
|
|
intern/implicit.h
|
|
|
|
SIM_mass_spring.h
|
|
)
|
|
|
|
set(LIB
|
|
bf_blenkernel
|
|
PRIVATE bf::blenlib
|
|
PRIVATE bf::dna
|
|
PRIVATE bf::intern::guardedalloc
|
|
)
|
|
|
|
if(WITH_OPENMP_STATIC)
|
|
list(APPEND LIB
|
|
${OpenMP_LIBRARIES}
|
|
)
|
|
endif()
|
|
|
|
blender_add_lib(bf_simulation "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
|