From 5fe2623613415a4a4d0eba319856bdb0aa41b653 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Sat, 2 Apr 2016 00:49:59 +0200 Subject: [PATCH] Prefer libpng1.6 over libpng1.2 if available --- CMakeLists.txt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3e062cdefb..caed4dda44 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -49,12 +49,15 @@ endif (DISABLE_NETWORK) option(STATIC "Create a static build.") -PKG_CHECK_MODULES(PNG libpng>=1.2) +PKG_CHECK_MODULES(PNG libpng>=1.6) if (NOT PNG_FOUND) - PKG_CHECK_MODULES(PNG libpng12) + PKG_CHECK_MODULES(PNG libpng16) endif (NOT PNG_FOUND) if (NOT PNG_FOUND) - PKG_CHECK_MODULES(PNG REQUIRED libpng16) + PKG_CHECK_MODULES(PNG libpng>=1.2) +endif (NOT PNG_FOUND) +if (NOT PNG_FOUND) + PKG_CHECK_MODULES(PNG REQUIRED libpng12) endif (NOT PNG_FOUND) PKG_CHECK_MODULES(ZLIB REQUIRED zlib)