[Cmake-commits] CMake branch, next, updated. v3.8.0-rc2-544-gc8c9513

[Kitware Robot]

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  c8c951303612b50a721e6b2a73064f0afe869b53 (commit)
       via  2c55c143c8648869ef4042bc980b55f76a51d3a9 (commit)
       via  63c0ba5ff136bcca413567e2073d4a8c7702f416 (commit)
       via  9753d4c27e61f1ed90061c9a65a7a30a16062405 (commit)
       via  2df8aa0c804038e7812b7acf47d5530d967d7ad7 (commit)
      from  7a329acab4fb6cad9900245d18120401546f6e25 (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=c8c951303612b50a721e6b2a73064f0afe869b53
commit c8c951303612b50a721e6b2a73064f0afe869b53
Merge: 7a329ac 2c55c14
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 21 17:17:05 2017 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Mar 21 13:17:07 2017 -0400

    Stage topic 'FindHDF5-optional-no-config'
    
    Topic-id: 23148
    Topic-url: https://gitlab.kitware.com/cmake/cmake/merge_requests/599


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2c55c143c8648869ef4042bc980b55f76a51d3a9
commit 2c55c143c8648869ef4042bc980b55f76a51d3a9
Merge: 63c0ba5 9753d4c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 21 13:12:16 2017 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Mar 21 13:12:16 2017 -0400

    Merge branch 'backport-FindHDF5-optional-no-config' into FindHDF5-optional-no-config

diff --cc Modules/FindHDF5.cmake
index 65af021,1005635..1e2ea69
--- a/Modules/FindHDF5.cmake
+++ b/Modules/FindHDF5.cmake
@@@ -99,8 -92,8 +99,11 @@@
  # ``HDF5_ROOT``
  #   Specify the path to the HDF5 installation to use.
  #
 +# ``HDF5_FIND_DEBUG``
 +#   Set to a true value to get some extra debugging output.
++#
+ # ``HDF5_NO_FIND_PACKAGE_CONFIG_FILE``
+ #   Set to a true value to skip trying to find ``hdf5-config.cmake``.
  
  # This module is maintained by Will Dicharry <wdicharry at stellarscience.com>.
  

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=63c0ba5ff136bcca413567e2073d4a8c7702f416
commit 63c0ba5ff136bcca413567e2073d4a8c7702f416
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 21 13:02:36 2017 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Mar 21 13:11:36 2017 -0400

    FindHDF5: Improve HDF5_ROOT and HDF5_FIND_DEBUG documentation

diff --git a/Modules/FindHDF5.cmake b/Modules/FindHDF5.cmake
index ff19866..65af021 100644
--- a/Modules/FindHDF5.cmake
+++ b/Modules/FindHDF5.cmake
@@ -96,9 +96,11 @@
 #
 # The following variable can be set to guide the search for HDF5 libraries and includes:
 #
-# HDF5_ROOT
+# ``HDF5_ROOT``
+#   Specify the path to the HDF5 installation to use.
 #
-# Set HDF5_FIND_DEBUG to true to get some extra debugging output.
+# ``HDF5_FIND_DEBUG``
+#   Set to a true value to get some extra debugging output.
 
 # This module is maintained by Will Dicharry <wdicharry at stellarscience.com>.
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9753d4c27e61f1ed90061c9a65a7a30a16062405
commit 9753d4c27e61f1ed90061c9a65a7a30a16062405
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 21 13:03:40 2017 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Mar 21 13:07:07 2017 -0400

    FindHDF5: Add option to skip finding package configuration file
    
    Some projects may not be prepared to use the imported targets defined by
    the HDF5 package configuration file.  Give users a way to skip this part
    of the search.
    
    Issue: #16718

diff --git a/Modules/FindHDF5.cmake b/Modules/FindHDF5.cmake
index 1c48763..1005635 100644
--- a/Modules/FindHDF5.cmake
+++ b/Modules/FindHDF5.cmake
@@ -91,6 +91,9 @@
 #
 # ``HDF5_ROOT``
 #   Specify the path to the HDF5 installation to use.
+#
+# ``HDF5_NO_FIND_PACKAGE_CONFIG_FILE``
+#   Set to a true value to skip trying to find ``hdf5-config.cmake``.
 
 # This module is maintained by Will Dicharry <wdicharry at stellarscience.com>.
 
@@ -391,7 +394,7 @@ else()
 endif()
 
 # Try to find HDF5 using an installed hdf5-config.cmake
-if(NOT HDF5_FOUND)
+if(NOT HDF5_FOUND AND NOT HDF5_NO_FIND_PACKAGE_CONFIG_FILE)
     find_package(HDF5 QUIET NO_MODULE
       HINTS ${HDF5_ROOT}
       ${_HDF5_SEARCH_OPTS}

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2df8aa0c804038e7812b7acf47d5530d967d7ad7
commit 2df8aa0c804038e7812b7acf47d5530d967d7ad7
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 21 13:02:36 2017 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Mar 21 13:02:36 2017 -0400

    FindHDF5: Improve HDF5_ROOT variable documentation

diff --git a/Modules/FindHDF5.cmake b/Modules/FindHDF5.cmake
index 65a825d..1c48763 100644
--- a/Modules/FindHDF5.cmake
+++ b/Modules/FindHDF5.cmake
@@ -89,7 +89,8 @@
 #
 # The following variable can be set to guide the search for HDF5 libraries and includes:
 #
-# HDF5_ROOT
+# ``HDF5_ROOT``
+#   Specify the path to the HDF5 installation to use.
 
 # This module is maintained by Will Dicharry <wdicharry at stellarscience.com>.
 

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

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


hooks/post-receive
-- 
CMake