[Cmake-commits] CMake branch, next, updated. v2.8.7-2059-gf6d971c

[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  f6d971ce36658c4089f1ae5dad4091c2b901e9f9 (commit)
       via  96ae584fb3346190eab430b1642a059dc650a06d (commit)
       via  c6382f37d1ccd33a4be69e68d2aa93442f4f251a (commit)
      from  8dabcd63ee6f802781785d815550b90a05aa18a8 (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=f6d971ce36658c4089f1ae5dad4091c2b901e9f9
commit f6d971ce36658c4089f1ae5dad4091c2b901e9f9
Merge: 8dabcd6 96ae584
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Tue Jan 10 15:13:25 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 10 15:13:25 2012 -0500

    Merge topic 'improve-findbzip2' into next
    
    96ae584 FindBZip2: add support for debug libraries (#12867)
    c6382f3 FindBZip2: add support for version checking


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=96ae584fb3346190eab430b1642a059dc650a06d
commit 96ae584fb3346190eab430b1642a059dc650a06d
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Tue Jan 10 14:12:09 2012 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Tue Jan 10 20:10:06 2012 +0100

    FindBZip2: add support for debug libraries (#12867)
    
    The debug library has a different name on Windows. Make sure both versions
    work.
    
    Thanks to Patrick Spendrin for testing this.

diff --git a/Modules/FindBZip2.cmake b/Modules/FindBZip2.cmake
index 25dfad0..5afba46 100644
--- a/Modules/FindBZip2.cmake
+++ b/Modules/FindBZip2.cmake
@@ -8,8 +8,9 @@
 #  BZIP2_VERSION_STRING - the version of BZip2 found (x.y.z)
 
 #=============================================================================
-# Copyright 2006-2009 Kitware, Inc.
+# Copyright 2006-2012 Kitware, Inc.
 # Copyright 2006 Alexander Neundorf <neundorf at kde.org>
+# Copyright 2012 Rolf Eike Beer <eike at sf-mail.de>
 #
 # Distributed under the OSI-approved BSD License (the "License");
 # see accompanying file Copyright.txt for details.
@@ -23,7 +24,14 @@
 
 FIND_PATH(BZIP2_INCLUDE_DIR bzlib.h )
 
-FIND_LIBRARY(BZIP2_LIBRARIES NAMES bz2 bzip2 )
+FIND_LIBRARY(BZIP2_LIBRARIES_RELEASE NAMES bz2 bzip2 )
+FIND_LIBRARY(BZIP2_LIBRARIES_DEBUG NAMES bzip2d bz2 bzip2 )
+
+IF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
+    SET(BZIP2_LIBRARIES optimized "${BZIP2_LIBRARIES_RELEASE}" debug "${BZIP2_LIBRARIES_DEBUG}")
+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]+ ")
@@ -39,8 +47,7 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(BZip2
 
 IF (BZIP2_FOUND)
    INCLUDE(CheckLibraryExists)
-   CHECK_LIBRARY_EXISTS(${BZIP2_LIBRARIES} BZ2_bzCompressInit "" BZIP2_NEED_PREFIX)
+   CHECK_LIBRARY_EXISTS("${BZIP2_LIBRARIES}" BZ2_bzCompressInit "" BZIP2_NEED_PREFIX)
 ENDIF (BZIP2_FOUND)
 
-MARK_AS_ADVANCED(BZIP2_INCLUDE_DIR BZIP2_LIBRARIES)
-
+MARK_AS_ADVANCED(BZIP2_INCLUDE_DIR BZIP2_LIBRARIES BZIP2_LIBRARIES_DEBUG BZIP2_LIBRARIES_RELEASE)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c6382f37d1ccd33a4be69e68d2aa93442f4f251a
commit c6382f37d1ccd33a4be69e68d2aa93442f4f251a
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Tue Jan 10 14:00:52 2012 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Tue Jan 10 20:07:06 2012 +0100

    FindBZip2: add support for version checking

diff --git a/Modules/FindBZip2.cmake b/Modules/FindBZip2.cmake
index 679c129..25dfad0 100644
--- a/Modules/FindBZip2.cmake
+++ b/Modules/FindBZip2.cmake
@@ -5,6 +5,7 @@
 #  BZIP2_INCLUDE_DIR - the BZip2 include directory
 #  BZIP2_LIBRARIES - Link these to use BZip2
 #  BZIP2_NEED_PREFIX - this is set if the functions are prefixed with BZ2_
+#  BZIP2_VERSION_STRING - the version of BZip2 found (x.y.z)
 
 #=============================================================================
 # Copyright 2006-2009 Kitware, Inc.
@@ -24,10 +25,17 @@ FIND_PATH(BZIP2_INCLUDE_DIR bzlib.h )
 
 FIND_LIBRARY(BZIP2_LIBRARIES NAMES bz2 bzip2 )
 
+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)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(BZip2 DEFAULT_MSG BZIP2_LIBRARIES BZIP2_INCLUDE_DIR)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(BZip2
+                                  REQUIRED_VARS BZIP2_LIBRARIES BZIP2_INCLUDE_DIR
+                                  VERSION_VAR BZIP2_VERSION_STRING)
 
 IF (BZIP2_FOUND)
    INCLUDE(CheckLibraryExists)

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

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


hooks/post-receive
-- 
CMake