From 8b73735d6525c57634a94a75caaae3257236b714 Mon Sep 17 00:00:00 2001 From: ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> Date: Fri, 29 May 2020 11:43:32 +0200 Subject: [PATCH] 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 4d43d8e04..2c8b0c48d 100644 --- a/CMake/options.cmake +++ b/CMake/options.cmake @@ -229,7 +229,11 @@ endif(OPTION_USE_SYSTEM_ZLIB AND NOT 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 AND LIB_jpeg) include(FindJPEG) @@ -253,7 +257,11 @@ endif(OPTION_USE_SYSTEM_LIBJPEG AND NOT 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 AND LIB_png) include(FindPNG)