[Cmake-commits] CMake branch, next, updated. v2.8.7-2217-g16c32ec

[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  16c32ec5470422683f6bd194bad3b416416e3a45 (commit)
       via  704cf062acc272fa5bc71569715a90fd8a75fd27 (commit)
      from  862538f7a8bff8dab0a0b792538ddd2b1e6ef3c1 (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=16c32ec5470422683f6bd194bad3b416416e3a45
commit 16c32ec5470422683f6bd194bad3b416416e3a45
Merge: 862538f 704cf06
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Tue Jan 24 13:09:56 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 24 13:09:56 2012 -0500

    Merge topic 'improve-findbzip2' into next
    
    704cf06 FindBZip2: use SelectLibraryConfigurations


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=704cf062acc272fa5bc71569715a90fd8a75fd27
commit 704cf062acc272fa5bc71569715a90fd8a75fd27
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Tue Jan 24 18:47:49 2012 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Tue Jan 24 19:06:35 2012 +0100

    FindBZip2: use SelectLibraryConfigurations

diff --git a/Modules/FindBZip2.cmake b/Modules/FindBZip2.cmake
index 4a05cef..bbdf1b4 100644
--- a/Modules/FindBZip2.cmake
+++ b/Modules/FindBZip2.cmake
@@ -26,13 +26,10 @@ FIND_PATH(BZIP2_INCLUDE_DIR bzlib.h )
 
 IF (NOT BZIP2_LIBRARIES)
     FIND_LIBRARY(BZIP2_LIBRARY_RELEASE NAMES bz2 bzip2 )
-    FIND_LIBRARY(BZIP2_LIBRARY_DEBUG NAMES bzip2d bz2 bzip2 )
+    FIND_LIBRARY(BZIP2_LIBRARY_DEBUG NAMES bzip2d )
 
-    IF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
-        SET(BZIP2_LIBRARIES optimized "${BZIP2_LIBRARY_RELEASE}" debug "${BZIP2_LIBRARY_DEBUG}")
-    ELSE (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
-        SET(BZIP2_LIBRARIES "${BZIP2_LIBRARY_RELEASE}")
-    ENDIF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
+    INCLUDE(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake)
+    SELECT_LIBRARY_CONFIGURATIONS(BZIP2)
 ENDIF (NOT BZIP2_LIBRARIES)
 
 IF (BZIP2_INCLUDE_DIR AND EXISTS "${BZIP2_INCLUDE_DIR}/bzlib.h")
@@ -49,14 +46,7 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(BZip2
 
 IF (BZIP2_FOUND)
    INCLUDE(CheckLibraryExists)
-   # 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_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_LIBRARY_DEBUG AND NOT BZIP2_LIBRARY_RELEASE)
+   CHECK_LIBRARY_EXISTS("${BZIP2_LIBRARIES}" BZ2_bzCompressInit "" BZIP2_NEED_PREFIX)
 ENDIF (BZIP2_FOUND)
 
-MARK_AS_ADVANCED(BZIP2_INCLUDE_DIR BZIP2_LIBRARY_DEBUG BZIP2_LIBRARY_RELEASE)
+MARK_AS_ADVANCED(BZIP2_INCLUDE_DIR)

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

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


hooks/post-receive
-- 
CMake