From cc981d329a91f1bf0715cbcfd7953c0c94256de3 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Thu, 25 Feb 2016 15:51:28 +0100 Subject: [PATCH] Fix CMake script to search for zlib. --- cmake/FindZlib.cmake | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/cmake/FindZlib.cmake b/cmake/FindZlib.cmake index 17b2d1e39..f29d2a8db 100644 --- a/cmake/FindZlib.cmake +++ b/cmake/FindZlib.cmake @@ -26,10 +26,6 @@ # ZLIB_INCLUDE_DIRS - the zlib include directory # ZLIB_LIBRARIES - The libraries needed to use zlib -set(_ZLIB_ROOT_PATHS - ${CMAKE_INSTALL_PREFIX} -) - find_path(ZLIB_INCLUDE_DIRS NAMES zlib.h HINTS _ZLIB_ROOT_PATHS @@ -41,20 +37,13 @@ if(ZLIB_INCLUDE_DIRS) endif() if(ENABLE_STATIC) - if(IOS OR QNX) - set(_ZLIB_STATIC_NAMES z) - else() - set(_ZLIB_STATIC_NAMES zstatic zlibstatic zlibstaticd) - endif() find_library(ZLIB_LIBRARIES - NAMES ${_ZLIB_STATIC_NAMES} - HINTS ${_ZLIB_ROOT_PATHS} + NAMES zstatic zlibstatic zlibstaticd z PATH_SUFFIXES bin lib ) else() find_library(ZLIB_LIBRARIES NAMES z zlib zlibd - HINTS ${_ZLIB_ROOT_PATHS} PATH_SUFFIXES bin lib ) endif()