blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 749 Projects 19 Wiki Activity

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.
This commit is contained in:
Ankit Meel 2020-10-15 18:49:45 +05:30
parent 78d1aa4d52
commit bac91956ae
Notes: blender-bot 2023-02-14 05:44:22 +01:00 
Referenced by commit bb872b25f2, CMake/macOS: Search for headers in Frameworks last.
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build_files/cmake/platform/platform_apple.cmake
View File

@ -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)