[Cmake-commits] CMake branch, next, updated. v2.8.7-2101-g50a965d

[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  50a965d65241c0ec4a175ab466d5b272f191c3c8 (commit)
       via  e573119e1173fe2a6ba81f9a458dfe4ab309aa1e (commit)
      from  74f785fed3dc44a02265e13c505033918f813ad9 (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=50a965d65241c0ec4a175ab466d5b272f191c3c8
commit 50a965d65241c0ec4a175ab466d5b272f191c3c8
Merge: 74f785f e573119
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sun Jan 15 14:28:09 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Jan 15 14:28:09 2012 -0500

    Merge topic 'improve-findbzip2' into next
    
    e573119 FindBZip2: fix variable naming


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e573119e1173fe2a6ba81f9a458dfe4ab309aa1e
commit e573119e1173fe2a6ba81f9a458dfe4ab309aa1e
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Sun Jan 15 20:27:44 2012 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Sun Jan 15 20:27:44 2012 +0100

    FindBZip2: fix variable naming

diff --git a/Modules/FindBZip2.cmake b/Modules/FindBZip2.cmake
index aec5716..4a05cef 100644
--- a/Modules/FindBZip2.cmake
+++ b/Modules/FindBZip2.cmake
@@ -25,13 +25,13 @@
 FIND_PATH(BZIP2_INCLUDE_DIR bzlib.h )
 
 IF (NOT BZIP2_LIBRARIES)
-    FIND_LIBRARY(BZIP2_LIBRARIES_RELEASE NAMES bz2 bzip2 )
-    FIND_LIBRARY(BZIP2_LIBRARIES_DEBUG NAMES bzip2d bz2 bzip2 )
+    FIND_LIBRARY(BZIP2_LIBRARY_RELEASE NAMES bz2 bzip2 )
+    FIND_LIBRARY(BZIP2_LIBRARY_DEBUG NAMES bzip2d bz2 bzip2 )
 
     IF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
-        SET(BZIP2_LIBRARIES optimized "${BZIP2_LIBRARIES_RELEASE}" debug "${BZIP2_LIBRARIES_DEBUG}")
+        SET(BZIP2_LIBRARIES optimized "${BZIP2_LIBRARY_RELEASE}" debug "${BZIP2_LIBRARY_DEBUG}")
     ELSE (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
-        SET(BZIP2_LIBRARIES "${BZIP2_LIBRARIES_RELEASE}")
+        SET(BZIP2_LIBRARIES "${BZIP2_LIBRARY_RELEASE}")
     ENDIF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
 ENDIF (NOT BZIP2_LIBRARIES)
 
@@ -52,11 +52,11 @@ IF (BZIP2_FOUND)
    # Make sure there is always a library to do the compile test.
    # If the user chooses a build configuration without a compatible library
    # this is a different problem.
-   IF (BZIP2_LIBRARIES_DEBUG AND NOT BZIP2_LIBRARIES_RELEASE)
-       CHECK_LIBRARY_EXISTS("${BZIP2_LIBRARIES_DEBUG}" BZ2_bzCompressInit "" BZIP2_NEED_PREFIX)
-   ELSE (BZIP2_LIBRARIES_DEBUG AND NOT BZIP2_LIBRARIES_RELEASE)
+   IF (BZIP2_LIBRARY_DEBUG AND NOT BZIP2_LIBRARY_RELEASE)
+       CHECK_LIBRARY_EXISTS("${BZIP2_LIBRARY_DEBUG}" BZ2_bzCompressInit "" BZIP2_NEED_PREFIX)
+   ELSE (BZIP2_LIBRARY_DEBUG AND NOT BZIP2_LIBRARY_RELEASE)
        CHECK_LIBRARY_EXISTS("${BZIP2_LIBRARIES}" BZ2_bzCompressInit "" BZIP2_NEED_PREFIX)
-   ENDIF (BZIP2_LIBRARIES_DEBUG AND NOT BZIP2_LIBRARIES_RELEASE)
+   ENDIF (BZIP2_LIBRARY_DEBUG AND NOT BZIP2_LIBRARY_RELEASE)
 ENDIF (BZIP2_FOUND)
 
-MARK_AS_ADVANCED(BZIP2_INCLUDE_DIR BZIP2_LIBRARIES_DEBUG BZIP2_LIBRARIES_RELEASE)
+MARK_AS_ADVANCED(BZIP2_INCLUDE_DIR BZIP2_LIBRARY_DEBUG BZIP2_LIBRARY_RELEASE)

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

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


hooks/post-receive
-- 
CMake