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 e4377d4774d4dc49957841295d37eb2101e1b5b5 (commit)
via 5850b8b79a813dbe8ad380c88878260cae3d7cbc (commit)
from 75b98c915ad702b74dec14f8df444721d9cff7de (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=e4377d4774d4dc49957841295d37eb2101e1b5b5
commit e4377d4774d4dc49957841295d37eb2101e1b5b5
Merge: 75b98c9 5850b8b
Author: Clinton Stimpson <clin...@elemtech.com>
Date: Thu Jun 24 10:53:59 2010 -0600
Merge branch 'zlib-version-perf' into next
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5850b8b79a813dbe8ad380c88878260cae3d7cbc
commit 5850b8b79a813dbe8ad380c88878260cae3d7cbc
Author: Clinton Stimpson <clin...@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:
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
