[Cmake-commits] CMake branch, next, updated. v2.8.7-2074-gc805ff8

[Rolf Eike Beer]

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  c805ff8fc46679487055949ebef98d525b6725bc (commit)
       via  dc5b85722992a1939c12c8fdf15ac38d300c9879 (commit)
      from  50f851e67ad2d387f6d1dc183823158e27bae3bd (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=c805ff8fc46679487055949ebef98d525b6725bc
commit c805ff8fc46679487055949ebef98d525b6725bc
Merge: 50f851e dc5b857
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Thu Jan 12 02:41:03 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 12 02:41:03 2012 -0500

    Merge topic 'improve-findbzip2' into next
    
    dc5b857 FindBZip2: always scan header for version


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dc5b85722992a1939c12c8fdf15ac38d300c9879
commit dc5b85722992a1939c12c8fdf15ac38d300c9879
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Thu Jan 12 08:39:58 2012 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Thu Jan 12 08:39:58 2012 +0100

    FindBZip2: always scan header for version

diff --git a/Modules/FindBZip2.cmake b/Modules/FindBZip2.cmake
index 60b23d5..23e27b1 100644
--- a/Modules/FindBZip2.cmake
+++ b/Modules/FindBZip2.cmake
@@ -33,13 +33,13 @@ IF (NOT BZIP2_LIBRARIES)
     ELSE (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
         SET(BZIP2_LIBRARIES "${BZIP2_LIBRARIES_RELEASE}")
     ENDIF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
-
-    IF (BZIP2_INCLUDE_DIR AND EXISTS "${BZIP2_INCLUDE_DIR}/bzlib.h")
-        FILE(STRINGS "${BZIP2_INCLUDE_DIR}/bzlib.h" BZLIB_H REGEX "bzip2/libbzip2 version [0-9]+\\.[^ ]+ of [0-9]+ ")
-        STRING(REGEX REPLACE ".* bzip2/libbzip2 version ([0-9]+\\.[^ ]+) of [0-9]+ .*" "\\1" BZIP2_VERSION_STRING "${BZLIB_H}")
-    ENDIF (BZIP2_INCLUDE_DIR AND EXISTS "${BZIP2_INCLUDE_DIR}/bzlib.h")
 ENDIF (NOT BZIP2_LIBRARIES)
 
+IF (BZIP2_INCLUDE_DIR AND EXISTS "${BZIP2_INCLUDE_DIR}/bzlib.h")
+    FILE(STRINGS "${BZIP2_INCLUDE_DIR}/bzlib.h" BZLIB_H REGEX "bzip2/libbzip2 version [0-9]+\\.[^ ]+ of [0-9]+ ")
+    STRING(REGEX REPLACE ".* bzip2/libbzip2 version ([0-9]+\\.[^ ]+) of [0-9]+ .*" "\\1" BZIP2_VERSION_STRING "${BZLIB_H}")
+ENDIF (BZIP2_INCLUDE_DIR AND EXISTS "${BZIP2_INCLUDE_DIR}/bzlib.h")
+
 # handle the QUIETLY and REQUIRED arguments and set BZip2_FOUND to TRUE if 
 # all listed variables are TRUE
 INCLUDE(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)

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

Summary of changes:
 Modules/FindBZip2.cmake |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake