From d59c6f01cd2889655a6853335bf2bbc475b71809 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Tue, 7 Apr 2015 16:14:53 +0200 Subject: [PATCH] Allow search for static zlib when building with CMake. --- cmake/FindZlib.cmake | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/cmake/FindZlib.cmake b/cmake/FindZlib.cmake index 6252049bc..86ebf913f 100644 --- a/cmake/FindZlib.cmake +++ b/cmake/FindZlib.cmake @@ -40,11 +40,19 @@ if(ZLIB_INCLUDE_DIRS) set(HAVE_ZLIB_H 1) endif() -find_library(ZLIB_LIBRARIES - NAMES z zlib zlibd - HINTS ${_ZLIB_ROOT_PATHS} - PATH_SUFFIXES bin lib -) +if(ENABLE_STATIC) + find_library(ZLIB_LIBRARIES + NAMES zstatic zlibstatic zlibstaticd + HINTS ${_ZLIB_ROOT_PATHS} + PATH_SUFFIXES bin lib + ) +else() + find_library(ZLIB_LIBRARIES + NAMES z zlib zlibd + HINTS ${_ZLIB_ROOT_PATHS} + PATH_SUFFIXES bin lib + ) +endif() include(FindPackageHandleStandardArgs) find_package_handle_standard_args(Zlib