[Cmake-commits] CMake branch, next, updated. v3.7.2-2185-gd302561

[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  d302561cf4715cf26095fa734bbdd81d66aa2251 (commit)
       via  5201a3065b1c49ee2628d95c860b667e9e2b182e (commit)
      from  4b20cb2c133792a8f6435a7bda7e585c3dcd20dc (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=d302561cf4715cf26095fa734bbdd81d66aa2251
commit d302561cf4715cf26095fa734bbdd81d66aa2251
Merge: 4b20cb2 5201a30
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 16 11:14:49 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 16 11:14:49 2017 -0500

    Merge topic 'findhdf5-libraries-targets' into next
    
    5201a306 FindHDF5: use the target rather than the path


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5201a3065b1c49ee2628d95c860b667e9e2b182e
commit 5201a3065b1c49ee2628d95c860b667e9e2b182e
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Wed Jan 4 15:03:42 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jan 16 11:13:48 2017 -0500

    FindHDF5: use the target rather than the path
    
    On Windows, the `LOCATION` property gets the path to the `.dll` rather
    than the `.lib` which is unsuitable for linking.

diff --git a/Modules/FindHDF5.cmake b/Modules/FindHDF5.cmake
index 16764e0..6e5a25e 100644
--- a/Modules/FindHDF5.cmake
+++ b/Modules/FindHDF5.cmake
@@ -439,8 +439,8 @@ if(NOT HDF5_FOUND AND NOT HDF5_ROOT)
                 set(HDF5_${_lang}_LIBRARY ${_lang_location} CACHE PATH
                     "HDF5 ${_lang} library" )
                 mark_as_advanced(HDF5_${_lang}_LIBRARY)
-                list(APPEND HDF5_LIBRARIES ${HDF5_${_lang}_LIBRARY})
-                set(HDF5_${_lang}_LIBRARIES ${HDF5_${_lang}_LIBRARY})
+                list(APPEND HDF5_LIBRARIES ${HDF5_${_lang}_TARGET}${_suffix})
+                set(HDF5_${_lang}_LIBRARIES ${HDF5_${_lang}_TARGET}${_suffix})
                 set(HDF5_${_lang}_FOUND True)
             endif()
             if(FIND_HL)
@@ -449,8 +449,8 @@ if(NOT HDF5_FOUND AND NOT HDF5_ROOT)
                     set(HDF5_${_lang}_HL_LIBRARY ${_lang_hl_location} CACHE PATH
                         "HDF5 ${_lang} HL library" )
                     mark_as_advanced(HDF5_${_lang}_HL_LIBRARY)
-                    list(APPEND HDF5_HL_LIBRARIES ${HDF5_${_lang}_HL_LIBRARY})
-                    set(HDF5_${_lang}_HL_LIBRARIES ${HDF5_${_lang}_HL_LIBRARY})
+                    list(APPEND HDF5_HL_LIBRARIES ${HDF5_${_lang}_TARGET}${_suffix})
+                    set(HDF5_${_lang}_HL_LIBRARIES ${HDF5_${_lang}_TARGET}${_suffix})
                     set(HDF5_HL_FOUND True)
                 endif()
             endif()

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

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


hooks/post-receive
-- 
CMake