summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJose Fonseca <jfonseca@vmware.com>2017-01-12 23:41:37 +0000
committerJose Fonseca <jfonseca@vmware.com>2017-01-12 23:43:14 +0000
commitd83ab10a737d861f6c25a3727f6e28dbf876e62b (patch)
tree4b659ed770c9b5c78a4adbd8cb6fc9309a4a0f69
parent023743c13239c51be8ac9a075970fb09a9d74409 (diff)
cmake: Use bundled libpng on macOS.
cmake often picks up libpng from /usr/local which does not not include i386 architecture.
-rw-r--r--CMakeLists.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ba52e904..f6016da5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -471,7 +471,7 @@ include_directories (${ZLIB_INCLUDE_DIRS})
# version), adding its include dirs and libraries, and overwriting ZLIB_FOUND.
# So if the system's ZLIB was did not meet the our requirements, then there's
# no safe way to use the system's PNG library.
-if (NOT WIN32 AND NOT ENABLE_STATIC_EXE AND ZLIB_FOUND)
+if (NOT WIN32 AND NOT APPLE AND NOT ENABLE_STATIC_EXE AND ZLIB_FOUND)
find_package (PNG)
endif ()
if (NOT PNG_FOUND)