Blender Git Loki

Git Commits -> Revision bb872b2

Revision bb872b2 by Ankit Meel (master)
October 16, 2020, 08:11 (GMT)
CMake/macOS: Search for headers in Frameworks last.

https://devtalk.blender.org/t/libpng-version-mismatch/15799/

By default, `CMAKE_FIND_FRAMEWORK` is `FIRST`.

CMake searches headers and libraries separately. So library is found
in LIBDIR, and headers like those in Mono are detected before the
headers in LIBDIR, and we get a version mismatch.

So set the priority of Frameworks to `LAST`.

https://gitlab.kitware.com/cmake/cmake/-/issues/18921
https://gitlab.kitware.com/cmake/cmake/-/issues/16427

{rBbac91956ae97} tried to fix the same issue, but it didn't work.
It's fine to keep the changes made there, just removing the comment
that may give false sense of security.

Commit Details:

Full Hash: bb872b25f219d1a9bc2446228b6dc7a9248d7f20
Parent Commit: 3ffe65a
Lines Changed: +8, -2

2 Modified Paths:

/build_files/cmake/macros.cmake (+8, -0) (Diff)
/build_files/cmake/platform/platform_apple.cmake (+0, -2) (Diff)
Tehnyt: Miika HämäläinenViimeksi päivitetty: 07.11.2014 14:18MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021