[Cmake-commits] CMake branch, master, updated. 4cde0b1a5ff1f3060bf58d402fb63cebf9d13cfb

cmake-commits at cmake.org cmake-commits at cmake.org
Thu May 13 00:34:56 EDT 2010


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  4cde0b1a5ff1f3060bf58d402fb63cebf9d13cfb (commit)
      from  6283ce67382ce140bf610ccaecb34eff19363b87 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4cde0b1a5ff1f3060bf58d402fb63cebf9d13cfb
commit 4cde0b1a5ff1f3060bf58d402fb63cebf9d13cfb
Author: Kovarththanan Rajaratnam <kovarththanan.rajaratnam at gmail.com>
Date:   Thu May 13 06:34:33 2010 +0200

    FindZLIB: make sure zlib.h exists before reading it

diff --git a/Modules/FindZLIB.cmake b/Modules/FindZLIB.cmake
index 499ae77..b437e6b 100644
--- a/Modules/FindZLIB.cmake
+++ b/Modules/FindZLIB.cmake
@@ -36,7 +36,7 @@ FIND_LIBRARY(ZLIB_LIBRARY
 )
 MARK_AS_ADVANCED(ZLIB_LIBRARY ZLIB_INCLUDE_DIR)
 
-IF (ZLIB_INCLUDE_DIR)
+IF (ZLIB_INCLUDE_DIR AND EXISTS "${ZLIB_INCLUDE_DIR}/zlib.h")
     FILE(READ "${ZLIB_INCLUDE_DIR}/zlib.h" ZLIB_H)
     STRING(REGEX REPLACE ".*#define ZLIB_VERSION \"([0-9]+)\\.([0-9]+)\\.([0-9]+)\".*" "\\1.\\2.\\3" ZLIB_VERSION_STRING "${ZLIB_H}")
 ENDIF()

-----------------------------------------------------------------------

Summary of changes:
 Modules/FindZLIB.cmake |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list