From 5f738a9819357bc17867cfe053e205d24bebc85a Mon Sep 17 00:00:00 2001 From: Tsuda Kageyu Date: Wed, 9 Jul 2014 09:52:08 +0900 Subject: [PATCH] Changed to skip the ZLib check when ZLIB_SOURCE is set. --- ConfigureChecks.cmake | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index 1df69f95..f2d4cae0 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -209,13 +209,14 @@ check_cxx_source_compiles(" # Check for libz using the cmake supplied FindZLIB.cmake -find_package(ZLIB) -if(ZLIB_FOUND) - set(HAVE_ZLIB 1) -else() - set(HAVE_ZLIB 0) +if(NOT ZLIB_SOURCE) + find_package(ZLIB) + if(ZLIB_FOUND) + set(HAVE_ZLIB 1) + else() + set(HAVE_ZLIB 0) + endif() endif() - set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules) find_package(CppUnit)