[Cmake-commits] CMake branch, next, updated. v2.8.4-1611-g94ce752

[Will Dicharry]

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  94ce752bdbd7886e68f897cf3d33f3d8b01dd30d (commit)
       via  e38216c6e97b7ba6dbac0829ae9cdf72525cc5cd (commit)
      from  0ce6545765effbcb9c9db0f60e5e1ad08627f229 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=94ce752bdbd7886e68f897cf3d33f3d8b01dd30d
commit 94ce752bdbd7886e68f897cf3d33f3d8b01dd30d
Merge: 0ce6545 e38216c
Author:     Will Dicharry <wdicharry at stellarscience.com>
AuthorDate: Wed May 25 15:20:24 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed May 25 15:20:24 2011 -0400

    Merge topic 'hdf5-module-bug-fix' into next
    
    e38216c Remove unnecessary mark_as_advanced from FindHDF5.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e38216c6e97b7ba6dbac0829ae9cdf72525cc5cd
commit e38216c6e97b7ba6dbac0829ae9cdf72525cc5cd
Author:     Will Dicharry <wdicharry at stellarscience.com>
AuthorDate: Wed May 25 13:19:26 2011 -0600
Commit:     Will Dicharry <wdicharry at stellarscience.com>
CommitDate: Wed May 25 13:19:26 2011 -0600

    Remove unnecessary mark_as_advanced from FindHDF5.

diff --git a/Modules/FindHDF5.cmake b/Modules/FindHDF5.cmake
index 92dad21..6f01ea0 100644
--- a/Modules/FindHDF5.cmake
+++ b/Modules/FindHDF5.cmake
@@ -363,6 +363,12 @@ if( NOT HDF5_FOUND )
         "HDF5 library compiled with parallel IO support" )
     mark_as_advanced( HDF5_IS_PARALLEL )
 
+    # For backwards compatibility we set HDF5_INCLUDE_DIR to the value of
+    # HDF5_INCLUDE_DIRS
+    if( HDF5_INCLUDE_DIRS )
+        set( HDF5_INCLUDE_DIR "${HDF5_INCLUDE_DIRS}" )
+    endif()
+
 endif()
 
 find_package_handle_standard_args( HDF5 DEFAULT_MSG 
@@ -370,18 +376,3 @@ find_package_handle_standard_args( HDF5 DEFAULT_MSG
     HDF5_INCLUDE_DIRS
 )
 
-if( HDF5_FOUND )
-    mark_as_advanced(
-        HDF5_INCLUDE_DIRS
-        HDF5_LIBRARIES
-        HDF5_DEFINTIONS
-        HDF5_LIBRARY_DIRS
-        HDF5_C_COMPILER_EXECUTABLE
-        HDF5_CXX_COMPILER_EXECUTABLE
-        HDF5_Fortran_COMPILER_EXECUTABLE )
-
-    # For backwards compatibility we set HDF5_INCLUDE_DIR to the value of
-    # HDF5_INCLUDE_DIRS
-    set( HDF5_INCLUDE_DIR "${HDF5_INCLUDE_DIRS}" )
-endif()
-

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

Summary of changes:
 Modules/FindHDF5.cmake |   21 ++++++---------------
 1 files changed, 6 insertions(+), 15 deletions(-)


hooks/post-receive
-- 
CMake