diff options
| author | Ankit Meel <ankitjmeel@gmail.com> | 2020-10-15 16:19:45 +0300 |
|---|---|---|
| committer | Ankit Meel <ankitjmeel@gmail.com> | 2020-10-15 16:19:45 +0300 |
| commit | bac91956ae9755722b81da4b6a0a394f9f77b2e1 (patch) | |
| tree | 5f90c39075f7967fa904c445e665fc7d1cc68564 /build_files | |
| parent | 78d1aa4d521cff25b07af2f6f8790d51b8b26064 (diff) | |
CMake/macOS: set package_ROOT for PNG, JPEG, TIFF
https://devtalk.blender.org/t/libpng-version-mismatch/15799/
In this case, CMake finds libraries in `LIBDIR`, but picks headers from
`/Library/Frameworks/` (Mono framework).
CMP0074 is already enabled, so use it.
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/cmake/platform/platform_apple.cmake | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake index 020f8defdc0..b22adbc68d5 100644 --- a/build_files/cmake/platform/platform_apple.cmake +++ b/build_files/cmake/platform/platform_apple.cmake @@ -227,10 +227,15 @@ if(WITH_SDL) set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -framework ForceFeedback") endif() +# Use CMP0074 for our benefit. Stop CMake from searching libraries in one +# place and headers in another. +set(PNG_ROOT ${LIBDIR}/png) find_package(PNG REQUIRED) +set(JPEG_ROOT ${LIBDIR}/jpeg) find_package(JPEG REQUIRED) +set(TIFF_ROOT ${LIBDIR}/tiff) find_package(TIFF REQUIRED) if(WITH_BOOST) |