Blender Git Loki

Git Commits -> Revision d93558e

Revision d93558e by Sergey Sharybin (master)
June 26, 2019, 17:50 (GMT)
Make deps: Fix detection/linking of PugiXML on Linux

This time both full `make deps` and final compilation is tested on
a freshly installed CentOS 7.

The thing is: OpenImageIO is not configured to use an external PugiXML
library, so it was compiling its own.
At the same time the OpenShadingLanguage library was commanded to use
an externally compiled PugiXML. This caused some sort of discrepancy
which lead to Blender-link-time errors. Could be linking error, could
be namespace related, could be ABI related. In any case since we do
have PugiXML in the OpenImageIO already lets just stick to it.

Commit Details:

Full Hash: d93558e91488f1c110a3a2e2e3399e2917f77e13
Parent Commit: a7e32db
Lines Changed: +14, -7

2 Modified Paths:

/build_files/build_environment/cmake/osl.cmake (+9, -6) (Diff)
/build_files/build_environment/CMakeLists.txt (+5, -1) (Diff)
Tehnyt: Miika HämäläinenViimeksi päivitetty: 07.11.2014 14:18MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021