[Cmake-commits] [cmake-commits] wdicharry committed FindHDF5.cmake 1.6 1.7

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv17582

Modified Files:
	FindHDF5.cmake 
Log Message:
Changed HDF5_INCLUDE_DIR to HDF5_INCLUDE_DIRS to conform to standards.


Index: FindHDF5.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindHDF5.cmake,v
retrieving revision 1.6
retrieving revision 1.7
diff -C 2 -d -r1.6 -r1.7
*** FindHDF5.cmake	29 Oct 2009 21:18:41 -0000	1.6
--- FindHDF5.cmake	13 Nov 2009 18:09:38 -0000	1.7
***************
*** 29,33 ****
  # 
  # This module will define the following variables:
! #  HDF5_INCLUDE_DIR - Location of the hdf5 includes
  #  HDF5_DEFINITIONS - Required compiler definitions for HDF5
  #  HDF5_C_LIBRARIES - Required libraries for the HDF5 C bindings.
--- 29,33 ----
  # 
  # This module will define the following variables:
! #  HDF5_INCLUDE_DIRS - Location of the hdf5 includes
  #  HDF5_DEFINITIONS - Required compiler definitions for HDF5
  #  HDF5_C_LIBRARIES - Required libraries for the HDF5 C bindings.
***************
*** 152,156 ****
  endmacro()
  
! if( HDF5_INCLUDE_DIR AND HDF5_LIBRARIES )
      # Do nothing: we already have HDF5_INCLUDE_PATH and HDF5_LIBRARIES in the
      # cache, it would be a shame to override them
--- 152,156 ----
  endmacro()
  
! if( HDF5_INCLUDE_DIRS AND HDF5_LIBRARIES )
      # Do nothing: we already have HDF5_INCLUDE_PATH and HDF5_LIBRARIES in the
      # cache, it would be a shame to override them
***************
*** 210,214 ****
          )
          mark_as_advanced( HDF5_${LANGUAGE}_INCLUDE_DIR )
!         list( APPEND HDF5_INCLUDE_DIR ${HDF5_${LANGUAGE}_INCLUDE_DIR} )
          
          set( HDF5_${LANGUAGE}_LIBRARY_NAMES 
--- 210,214 ----
          )
          mark_as_advanced( HDF5_${LANGUAGE}_INCLUDE_DIR )
!         list( APPEND HDF5_INCLUDE_DIRS ${HDF5_${LANGUAGE}_INCLUDE_DIR} )
          
          set( HDF5_${LANGUAGE}_LIBRARY_NAMES 
***************
*** 267,272 ****
      # process for the language bindings (both the C and C++ bindings depend on
      # libz for example).  Remove the duplicates.
!     if( HDF5_INCLUDE_DIR )
!         list( REMOVE_DUPLICATES HDF5_INCLUDE_DIR )
      endif()
      if( HDF5_LIBRARIES_DEBUG )
--- 267,272 ----
      # process for the language bindings (both the C and C++ bindings depend on
      # libz for example).  Remove the duplicates.
!     if( HDF5_INCLUDE_DIRS )
!         list( REMOVE_DUPLICATES HDF5_INCLUDE_DIRS )
      endif()
      if( HDF5_LIBRARIES_DEBUG )
***************
*** 293,299 ****
      # HDF5 was compiled with parallel IO support
      set( HDF5_IS_PARALLEL FALSE )
!     if( HDF5_INCLUDE_DIR )
!         if( EXISTS "${HDF5_INCLUDE_DIR}/h5pubconf.h" )
!             file( STRINGS "${HDF5_INCLUDE_DIR}/H5pubconf.h" 
                  HDF5_HAVE_PARALLEL_DEFINE
                  REGEX "HAVE_PARALLEL 1" )
--- 293,299 ----
      # HDF5 was compiled with parallel IO support
      set( HDF5_IS_PARALLEL FALSE )
!     if( HDF5_INCLUDE_DIRS )
!         if( EXISTS "${HDF5_INCLUDE_DIRS}/h5pubconf.h" )
!             file( STRINGS "${HDF5_INCLUDE_DIRS}/H5pubconf.h" 
                  HDF5_HAVE_PARALLEL_DEFINE
                  REGEX "HAVE_PARALLEL 1" )
***************
*** 311,319 ****
  find_package_handle_standard_args( HDF5 DEFAULT_MSG 
      HDF5_LIBRARIES 
!     HDF5_INCLUDE_DIR
  )
  
  mark_as_advanced( 
!     HDF5_INCLUDE_DIR 
      HDF5_LIBRARIES 
      HDF5_DEFINTIONS
--- 311,319 ----
  find_package_handle_standard_args( HDF5 DEFAULT_MSG 
      HDF5_LIBRARIES 
!     HDF5_INCLUDE_DIRS
  )
  
  mark_as_advanced( 
!     HDF5_INCLUDE_DIRS 
      HDF5_LIBRARIES 
      HDF5_DEFINTIONS