[Cmake-commits] CMake branch, master, updated. v3.6.0-359-g056db89

2016-07-12 Thread 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, master has been updated
   via  056db896e396b7fb15d8f813ad1989c67c6f623f (commit)
  from  49f5818d8a4d134ff9a6060596078d9da4c38f95 (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=056db896e396b7fb15d8f813ad1989c67c6f623f
commit 056db896e396b7fb15d8f813ad1989c67c6f623f
Author: Kitware Robot <kwro...@kitware.com>
AuthorDate: Wed Jul 13 00:01:03 2016 -0400
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Wed Jul 13 00:01:03 2016 -0400

CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 61847ff..ba264f6 100644
--- a/Source/CMakeVersion.cmake
+++ b/Source/CMakeVersion.cmake
@@ -1,5 +1,5 @@
 # CMake version number components.
 set(CMake_VERSION_MAJOR 3)
 set(CMake_VERSION_MINOR 6)
-set(CMake_VERSION_PATCH 20160712)
+set(CMake_VERSION_PATCH 20160713)
 #set(CMake_VERSION_RC 1)

---

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


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, next, updated. v3.6.0-788-gf405373

2016-07-12 Thread Chuck Atkins 
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  f4053736f27e15046f0f130d8559414c3bee0c9d (commit)
   via  d5e4516ec279318d3c639cda2f20149f0a588220 (commit)
   via  4ece8bdd0fa36d8e69dabf8c620f9e5017e8 (commit)
   via  87c1cd9c517bb57a537ba1f75548e6c20966553d (commit)
  from  0d7f858b7a6e8f1d0e49fadce08b57ea56eab062 (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=f4053736f27e15046f0f130d8559414c3bee0c9d
commit f4053736f27e15046f0f130d8559414c3bee0c9d
Merge: 0d7f858 d5e4516
Author: Chuck Atkins 
AuthorDate: Tue Jul 12 15:55:06 2016 -0400
Commit: CMake Topic Stage 
CommitDate: Tue Jul 12 15:55:06 2016 -0400

Merge topic 'fix-misc-hdf5-issues' into next

d5e4516e FindHDF5: Cleanup inconsistent use of HDF5_ROOT
4ece8bdd FindHDF5: Properly fail when required components are not found.
87c1cd9c FindHDF5: Fix h5cc arg parsing to work with homebrew on Mac


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d5e4516ec279318d3c639cda2f20149f0a588220
commit d5e4516ec279318d3c639cda2f20149f0a588220
Author: Chuck Atkins 
AuthorDate: Tue Jul 12 15:32:10 2016 -0400
Commit: Chuck Atkins 
CommitDate: Tue Jul 12 15:32:10 2016 -0400

FindHDF5: Cleanup inconsistent use of HDF5_ROOT

diff --git a/Modules/FindHDF5.cmake b/Modules/FindHDF5.cmake
index a81ba13..50e1892 100644
--- a/Modules/FindHDF5.cmake
+++ b/Modules/FindHDF5.cmake
@@ -378,6 +378,10 @@ macro( _HDF5_parse_compile_line
 endforeach()
 endmacro()
 
+if(NOT HDF5_ROOT)
+set(HDF5_ROOT $ENV{HDF5_ROOT})
+endif()
+
 # Try to find HDF5 using an installed hdf5-config.cmake
 if(NOT HDF5_FOUND AND NOT HDF5_ROOT)
 find_package(HDF5 QUIET NO_MODULE)
@@ -478,7 +482,6 @@ if(NOT HDF5_FOUND AND NOT HDF5_ROOT)
   # search options with the wrapper
   find_program(HDF5_${__lang}_COMPILER_EXECUTABLE
 NAMES ${HDF5_${__lang}_COMPILER_NAMES} NAMES_PER_DIR
-HINTS ENV HDF5_ROOT
 PATH_SUFFIXES bin Bin
 DOC "HDF5 ${__lang} Wrapper compiler.  Used only to detect HDF5 
compile flags."
   )
@@ -590,10 +593,14 @@ elseif(NOT HDF5_FOUND AND NOT _HDF5_NEED_TO_SEARCH)
   endif()
 endif()
 
+if(HDF5_ROOT)
+set(SEARCH_OPTS NO_DEFAULT_PATH)
+endif()
 find_program( HDF5_DIFF_EXECUTABLE
 NAMES h5diff
-HINTS ENV HDF5_ROOT
+HINTS ${HDF5_ROOT}
 PATH_SUFFIXES bin Bin
+${SEARCH_OPTS}
 DOC "HDF5 file differencing tool." )
 mark_as_advanced( HDF5_DIFF_EXECUTABLE )
 
@@ -608,9 +615,6 @@ if( NOT HDF5_FOUND )
 set(HDF5_Fortran_LIBRARY_NAMEShdf5_fortran   ${HDF5_C_LIBRARY_NAMES})
 set(HDF5_Fortran_HL_LIBRARY_NAMES hdf5_hl_fortran 
${HDF5_C_HL_LIBRARY_NAMES} ${HDF5_Fortran_LIBRARY_NAMES})
 
-if(HDF5_ROOT)
-set(SEARCH_OPTS NO_DEFAULT_PATH)
-endif()
 foreach(__lang IN LISTS HDF5_LANGUAGE_BINDINGS)
 # find the HDF5 include directories
 if(LANGUAGE STREQUAL "Fortran")
@@ -622,7 +626,7 @@ if( NOT HDF5_FOUND )
 endif()
 
 find_path(HDF5_${__lang}_INCLUDE_DIR ${HDF5_INCLUDE_FILENAME}
-HINTS ${HDF5_ROOT} ENV HDF5_ROOT
+HINTS ${HDF5_ROOT}
 PATHS $ENV{HOME}/.local/include
 PATH_SUFFIXES include Include
 ${SEARCH_OPTS}
@@ -648,12 +652,12 @@ if( NOT HDF5_FOUND )
 endif()
 find_library(HDF5_${LIB}_LIBRARY_DEBUG
 NAMES ${THIS_LIBRARY_SEARCH_DEBUG}
-HINTS ${HDF5_ROOT} ENV HDF5_ROOT PATH_SUFFIXES lib Lib
+HINTS ${HDF5_ROOT} PATH_SUFFIXES lib Lib
 ${SEARCH_OPTS}
 )
 find_library( HDF5_${LIB}_LIBRARY_RELEASE
 NAMES ${THIS_LIBRARY_SEARCH_RELEASE}
-HINTS ${HDF5_ROOT} ENV HDF5_ROOT PATH_SUFFIXES lib Lib
+HINTS ${HDF5_ROOT} PATH_SUFFIXES lib Lib
 ${SEARCH_OPTS}
 )
 select_library_configurations( HDF5_${LIB} )
@@ -685,12 +689,12 @@ if( NOT HDF5_FOUND )
 endif()
 find_library(HDF5_${LIB}_LIBRARY_DEBUG
 NAMES ${THIS_LIBRARY_SEARCH_DEBUG}
-HINTS ${HDF5_ROOT} ENV HDF5_ROOT PATH_SUFFIXES lib Lib
+HINTS ${HDF5_ROOT} PATH_SUFFIXES lib Lib
 ${SEARCH_OPTS}
 )
 find_library( HDF5_${LIB}_LIBRARY_RELEASE
 NAMES ${THIS_LIBRARY_SEARCH_RELEASE}
-HINTS ${HDF5_ROOT} ENV HDF5_ROOT PATH_SUFFIXES lib Lib
+