[Cmake-commits] CMake branch, next, updated. v3.5.2-1180-g0121aec

[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  0121aecb636f5fee00290bdcd18ea1e3011fb5a3 (commit)
       via  313676c9f0e5be339bff2064cb649b075c6b8e12 (commit)
      from  67ad27c3129bfd55d2ed78ad8dfa5aaea20da040 (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=0121aecb636f5fee00290bdcd18ea1e3011fb5a3
commit 0121aecb636f5fee00290bdcd18ea1e3011fb5a3
Merge: 67ad27c 313676c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon May 2 11:33:51 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon May 2 11:33:51 2016 -0400

    Merge topic 'FindHDF5-debug-suffix' into next
    
    313676c9 FindHDF5: Add another debug suffix


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=313676c9f0e5be339bff2064cb649b075c6b8e12
commit 313676c9f0e5be339bff2064cb649b075c6b8e12
Author:     FARBOS Arnaud <farbos.arnaud at gmail.com>
AuthorDate: Mon May 2 16:19:28 2016 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon May 2 11:31:35 2016 -0400

    FindHDF5: Add another debug suffix
    
    HDF5 1.8.16 (and likely others) names its debug libraries with a
    `_debug` suffix intsead of `d`.

diff --git a/Modules/FindHDF5.cmake b/Modules/FindHDF5.cmake
index 9f6e666..38a728e 100644
--- a/Modules/FindHDF5.cmake
+++ b/Modules/FindHDF5.cmake
@@ -310,10 +310,10 @@ if( NOT HDF5_FOUND )
                 # See https://cmake.org/Bug/view.php?id=1643.  We search
                 # first for the full static library name, but fall back to a
                 # generic search on the name if the static search fails.
-                set( THIS_LIBRARY_SEARCH_DEBUG lib${LIB}d.a ${LIB}d )
+                set( THIS_LIBRARY_SEARCH_DEBUG lib${LIB}d.a lib${LIB}_debug.a ${LIB}d ${LIB}_debug )
                 set( THIS_LIBRARY_SEARCH_RELEASE lib${LIB}.a ${LIB} )
             else()
-                set( THIS_LIBRARY_SEARCH_DEBUG ${LIB}d )
+                set( THIS_LIBRARY_SEARCH_DEBUG ${LIB}d ${LIB}_debug )
                 set( THIS_LIBRARY_SEARCH_RELEASE ${LIB} )
             endif()
             find_library( HDF5_${LIB}_LIBRARY_DEBUG

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

Summary of changes:
 Modules/FindHDF5.cmake |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake