]> granicus.if.org Git - taglib/commitdiff
Changed to skip the ZLib check when ZLIB_SOURCE is set.
authorTsuda Kageyu <tsuda.kageyu@gmail.com>
Wed, 9 Jul 2014 00:52:08 +0000 (09:52 +0900)
committerTsuda Kageyu <tsuda.kageyu@gmail.com>
Wed, 9 Jul 2014 00:52:08 +0000 (09:52 +0900)
ConfigureChecks.cmake

index 1df69f95141c256126a59b8c6083e19b959eb4fd..f2d4cae07c261555d2dfdb8e54b9ca73d141fff7 100644 (file)
@@ -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)