[Cmake-commits] CMake branch, next, updated. v3.6.0-rc1-114-g9b3bbc0

[Roger Leigh]

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  9b3bbc0720dc2482a8d8b7af7840eb287df2777b (commit)
       via  132b8989680b50cb9cc9c72e2ffb806cfb3534c2 (commit)
      from  be12b9ab1246bd1d7a31dc90515f33d8fff455f1 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9b3bbc0720dc2482a8d8b7af7840eb287df2777b
commit 9b3bbc0720dc2482a8d8b7af7840eb287df2777b
Merge: be12b9a 132b898
Author:     Roger Leigh <rleigh at codelibre.net>
AuthorDate: Tue Jun 7 17:50:43 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jun 7 17:50:43 2016 -0400

    Merge topic 'bzip2-debug-names' into next
    
    132b8989 FindBZip2: Search for additional bz2d debug library name


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=132b8989680b50cb9cc9c72e2ffb806cfb3534c2
commit 132b8989680b50cb9cc9c72e2ffb806cfb3534c2
Author:     Roger Leigh <rleigh at codelibre.net>
AuthorDate: Tue Jun 7 22:46:40 2016 +0100
Commit:     Roger Leigh <rleigh at codelibre.net>
CommitDate: Tue Jun 7 22:46:40 2016 +0100

    FindBZip2: Search for additional bz2d debug library name

diff --git a/Modules/FindBZip2.cmake b/Modules/FindBZip2.cmake
index 6af42dd..b670025 100644
--- a/Modules/FindBZip2.cmake
+++ b/Modules/FindBZip2.cmake
@@ -37,7 +37,7 @@ find_path(BZIP2_INCLUDE_DIR bzlib.h ${_BZIP2_PATHS} PATH_SUFFIXES include)
 
 if (NOT BZIP2_LIBRARIES)
     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)
+    find_library(BZIP2_LIBRARY_DEBUG NAMES bz2d bzip2d ${_BZIP2_PATHS} PATH_SUFFIXES lib)
 
     include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake)
     SELECT_LIBRARY_CONFIGURATIONS(BZIP2)

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

Summary of changes:
 Modules/FindBZip2.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake