[Cmake-commits] CMake branch, next, updated. v3.6.0-rc3-542-g3202c19

[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  3202c190f01eaa8f3ed8ef06148406bdd4087d5e (commit)
       via  234deec2ea265f130a220547bcbc697bacbb25c6 (commit)
       via  963b576fd2605f25ced8790fc17f5baa6ecee761 (commit)
      from  56b88e20cd8dfdb1cd2abb8ff300b4c48ec06714 (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=3202c190f01eaa8f3ed8ef06148406bdd4087d5e
commit 3202c190f01eaa8f3ed8ef06148406bdd4087d5e
Merge: 56b88e2 234deec
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jun 27 10:28:51 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jun 27 10:28:51 2016 -0400

    Merge topic 'FindHDF5-handle-unsuffixed' into next
    
    234deec2 FindHDF5: create all the *_LIBRARIES when using hdf5-config.cmake
    963b576f FindHDF5: cache the correct path to the high level libraries


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=234deec2ea265f130a220547bcbc697bacbb25c6
commit 234deec2ea265f130a220547bcbc697bacbb25c6
Author:     Robert Maynard <robert.maynard at kitware.com>
AuthorDate: Fri Jun 24 15:28:23 2016 -0400
Commit:     Robert Maynard <robert.maynard at kitware.com>
CommitDate: Fri Jun 24 15:28:23 2016 -0400

    FindHDF5: create all the *_LIBRARIES when using hdf5-config.cmake

diff --git a/Modules/FindHDF5.cmake b/Modules/FindHDF5.cmake
index ce3b6d0..b074f63 100644
--- a/Modules/FindHDF5.cmake
+++ b/Modules/FindHDF5.cmake
@@ -381,6 +381,7 @@ if(NOT HDF5_FOUND AND NOT HDF5_ROOT)
                     "HDF5 ${_lang} library" )
                 mark_as_advanced(HDF5_${_lang}_LIBRARY)
                 list(APPEND HDF5_LIBRARIES ${HDF5_${_lang}_LIBRARY})
+                set(HDF5_${_lang}_LIBRARIES ${HDF5_${_lang}_LIBRARY})
             endif()
             if(FIND_HL)
                 get_target_property(_lang_hl_location ${HDF5_${_lang}_HL_TARGET}${_suffix} LOCATION)
@@ -389,6 +390,7 @@ if(NOT HDF5_FOUND AND NOT HDF5_ROOT)
                         "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})
                 endif()
             endif()
         endforeach()
@@ -424,6 +426,8 @@ if(NOT HDF5_FOUND AND NOT HDF5_ROOT)
       set(HDF5_${__lang}_DEFINITIONS)
       set(HDF5_${__lang}_INCLUDE_DIRS)
       set(HDF5_${__lang}_LIBRARIES)
+      set(HDF5_${__lang}_HL_LIBRARIES)
+
       mark_as_advanced(HDF5_${__lang}_COMPILER_EXECUTABLE_NO_INTERROGATE)
       mark_as_advanced(HDF5_${__lang}_DEFINITIONS)
       mark_as_advanced(HDF5_${__lang}_INCLUDE_DIRS)

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=963b576fd2605f25ced8790fc17f5baa6ecee761
commit 963b576fd2605f25ced8790fc17f5baa6ecee761
Author:     Robert Maynard <robert.maynard at kitware.com>
AuthorDate: Fri Jun 24 15:26:22 2016 -0400
Commit:     Robert Maynard <robert.maynard at kitware.com>
CommitDate: Fri Jun 24 15:26:22 2016 -0400

    FindHDF5: cache the correct path to the high level libraries

diff --git a/Modules/FindHDF5.cmake b/Modules/FindHDF5.cmake
index 7c1581d..ce3b6d0 100644
--- a/Modules/FindHDF5.cmake
+++ b/Modules/FindHDF5.cmake
@@ -384,10 +384,10 @@ if(NOT HDF5_FOUND AND NOT HDF5_ROOT)
             endif()
             if(FIND_HL)
                 get_target_property(_lang_hl_location ${HDF5_${_lang}_HL_TARGET}${_suffix} LOCATION)
-                if( _lang_location )
-                    set(HDF5_${_lang}_HL_LIBRARY ${_lang_location} CACHE PATH
+                if( _lang_hl_location )
+                    set(HDF5_${_lang}_HL_LIBRARY ${_lang_hl_location} CACHE PATH
                         "HDF5 ${_lang} HL library" )
-                    mark_as_advanced(HDF5_${_lang}_LIBRARY)
+                    mark_as_advanced(HDF5_${_lang}_HL_LIBRARY)
                     list(APPEND HDF5_HL_LIBRARIES ${HDF5_${_lang}_HL_LIBRARY})
                 endif()
             endif()

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

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


hooks/post-receive
-- 
CMake