From ed0c443253bf33152f8a54a0d60d3a9bf6788ae8 Mon Sep 17 00:00:00 2001 From: ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> Date: Sat, 18 Jan 2020 16:04:58 +0100 Subject: Set OPTION_USE_SYSTEM_LIBPNG/JPEG off under macOS by default --- CMake/options.cmake | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/CMake/options.cmake b/CMake/options.cmake index 1fa80c672..1563540cd 100644 --- a/CMake/options.cmake +++ b/CMake/options.cmake @@ -338,7 +338,11 @@ endif (ZLIB_FOUND) set (HAVE_LIBZ 1) ####################################################################### -option (OPTION_USE_SYSTEM_LIBJPEG "use system libjpeg" ON) +if (APPLE) + option (OPTION_USE_SYSTEM_LIBJPEG "use system libjpeg" OFF) +else () + option (OPTION_USE_SYSTEM_LIBJPEG "use system libjpeg" ON) +endif (APPLE) if (OPTION_USE_SYSTEM_LIBJPEG) include (FindJPEG) @@ -362,7 +366,11 @@ endif (JPEG_FOUND) set (HAVE_LIBJPEG 1) ####################################################################### -option (OPTION_USE_SYSTEM_LIBPNG "use system libpng" ON) +if (APPLE) + option (OPTION_USE_SYSTEM_LIBPNG "use system libpng" OFF) +else () + option (OPTION_USE_SYSTEM_LIBPNG "use system libpng" ON) +endif (APPLE) if (OPTION_USE_SYSTEM_LIBPNG) include (FindPNG) -- cgit v1.2.3