[Cmake-commits] CMake branch, next, updated. v2.8.1-1473-gc58a3d1

[Clinton Stimpson]

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, next has been updated
       via  c58a3d16c86f7ccb9e1ccfa96a9fa6a179403e85 (commit)
       via  1fbcfa52be1f23a8cc71adde1ca1a7f0be3e4d80 (commit)
      from  bee4ee39e2cd5a297c44ff203b5b3a1108fac415 (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=c58a3d16c86f7ccb9e1ccfa96a9fa6a179403e85
commit c58a3d16c86f7ccb9e1ccfa96a9fa6a179403e85
Merge: bee4ee3 1fbcfa5
Author: Clinton Stimpson <clinton at elemtech.com>
Date:   Tue Jun 22 09:20:26 2010 -0600

    Merge branch 'zlib-version-perf' into next


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1fbcfa52be1f23a8cc71adde1ca1a7f0be3e4d80
commit 1fbcfa52be1f23a8cc71adde1ca1a7f0be3e4d80
Author: Clinton Stimpson <clinton at elemtech.com>
Date:   Tue Jun 22 09:17:44 2010 -0600

    Fix performance issue with getting version from zlib.h
    
    Some zlib.h files have ZLIB_VERSION "1.2.3.3" with 4 numbers instead of 3.
    The regex is changed to grab the first 3 numbers.
    It was slow because if it failed to find that string near the top of the file,
    where it usually is, it would read the entire file.

diff --git a/Modules/FindZLIB.cmake b/Modules/FindZLIB.cmake
index b437e6b..7432257 100644
--- a/Modules/FindZLIB.cmake
+++ b/Modules/FindZLIB.cmake
@@ -38,7 +38,7 @@ MARK_AS_ADVANCED(ZLIB_LIBRARY 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}")
+    STRING(REGEX REPLACE ".*#define ZLIB_VERSION \"([0-9]+)\\.([0-9]+)\\.([0-9]+).*" "\\1.\\2.\\3" ZLIB_VERSION_STRING "${ZLIB_H}")
 ENDIF()
 
 # handle the QUIETLY and REQUIRED arguments and set ZLIB_FOUND to TRUE if 

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

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


hooks/post-receive
-- 
CMake