[Cmake-commits] CMake branch, next, updated. v2.8.8-3021-g8d1eec5

[Brad King]

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  8d1eec54db1d4180616411ab47d0298bcedb5483 (commit)
       via  7c912af2d06caeb0632b3f26cc9ee9bd8f0e6076 (commit)
      from  bd705288cbcd6ca672ccb3ff30019a517bb269f7 (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=8d1eec54db1d4180616411ab47d0298bcedb5483
commit 8d1eec54db1d4180616411ab47d0298bcedb5483
Merge: bd70528 7c912af
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jun 5 16:06:30 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jun 5 16:06:30 2012 -0400

    Merge topic 'FindBZip2-GnuWin32-registry' into next
    
    7c912af FindBZip2: Search locations in GnuWin32 registry


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7c912af2d06caeb0632b3f26cc9ee9bd8f0e6076
commit 7c912af2d06caeb0632b3f26cc9ee9bd8f0e6076
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jun 5 16:01:54 2012 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jun 5 16:01:54 2012 -0400

    FindBZip2: Search locations in GnuWin32 registry
    
    The GnuWin32 "bzip2" installer stores in the registry key
    
     HKEY_LOCAL_MACHINE\SOFTWARE\GnuWin32\Bzip2
    
    an "InstallPath" value.  Use this entry as a search location.

diff --git a/Modules/FindBZip2.cmake b/Modules/FindBZip2.cmake
index 7130192..ce7f255 100644
--- a/Modules/FindBZip2.cmake
+++ b/Modules/FindBZip2.cmake
@@ -22,11 +22,15 @@
 # (To distribute this file outside of CMake, substitute the full
 #  License text for the above reference.)
 
-FIND_PATH(BZIP2_INCLUDE_DIR bzlib.h )
+SET(_BZIP2_PATHS PATHS
+  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\GnuWin32\\Bzip2;InstallPath]"
+  )
+
+FIND_PATH(BZIP2_INCLUDE_DIR bzlib.h ${_BZIP2_PATHS} PATH_SUFFIXES include)
 
 IF (NOT BZIP2_LIBRARIES)
-    FIND_LIBRARY(BZIP2_LIBRARY_RELEASE NAMES bz2 bzip2 )
-    FIND_LIBRARY(BZIP2_LIBRARY_DEBUG NAMES bzip2d )
+    FIND_LIBRARY(BZIP2_LIBRARY_RELEASE NAMES bz2 bzip2 ${_BZIP2_PATHS} PATH_SUFFIXES lib)
+    FIND_LIBRARY(BZIP2_LIBRARY_DEBUG NAMES bzip2d ${_BZIP2_PATHS} PATH_SUFFIXES lib)
 
     INCLUDE(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake)
     SELECT_LIBRARY_CONFIGURATIONS(BZIP2)

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

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


hooks/post-receive
-- 
CMake