Merge pull request #1 from stuartcampbell/master

Remove locale FindHDF5 and use CMake's version

cmake/CMakeLists.txt.depends

 SET(cmake_policy NO_POLICY_SCOPE)
 
 IF(CRAY)
-SET(CMAKE_CXX_COMPILER /opt/cray/xt-asyncpe/3.7/bin/CC)
+  SET(CMAKE_CXX_COMPILER /opt/cray/xt-asyncpe/3.7/bin/CC)
 ELSE(CRAY)
-FIND_PACKAGE(MPI)
-SET(CMAKE_CXX_COMPILER ${MPI_COMPILER}) 
+  FIND_PACKAGE(MPI)
+  SET(CMAKE_CXX_COMPILER ${MPI_COMPILER})
 ENDIF(CRAY)
 
 SET(FFTW3_DIR /opt/fftw/3.2.2)
@@ -31,7 +31,7 @@ INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}/geometry)
 
 MESSAGE(STATUS "Searching for HDF5" )
 
-FIND_PACKAGE(HDF5 REQUIRED)
+FIND_PACKAGE(HDF5 REQUIRED COMPONENTS CXX HL)
 INCLUDE_DIRECTORIES( ${HDF5_INCLUDE_DIR})
 
 SET(HDF5_CLIB "$ENV{HDF5_CLIB}")
@@ -39,8 +39,8 @@ IF(HDF5_CLIB)
 SET(HDF5_LIBRARIES "$ENV{HDF5_CLIB}")
 ENDIF(HDF5_CLIB)
 
-IF(FOUND_HDF5)
-MESSAGE(STATUS "HDF5 found:" ${HDF5_LIBRARIES})
-ELSE(FOUND_HDF5)
-MESSAGE(WARNING "HDF5 not found")
-ENDIF(FOUND_HDF5)
+IF(HDF5_FOUND)
+  MESSAGE(STATUS "HDF5 found:" ${HDF5_LIBRARIES})
+ELSE(HDF5_FOUND)
+  MESSAGE(WARNING "HDF5 not found")
+ENDIF(HDF5_FOUND)

cmake/modules/FindHDF5.cmake

-#
-# this module look for HDF5 (http://hdf.ncsa.uiuc.edu) support
-# it will define the following values
-#
-# HDF5_INCLUDE_DIR  = where hdf5.h can be found
-# HDF5_LIBRARY      = the library to link against (hdf5 etc)
-# FOUND_HDF5        = set to true after finding the library
-#
-IF(EXISTS ${PROJECT_CMAKE}/Hdf5Config.cmake)
-  INCLUDE(${PROJECT_CMAKE}/Hdf5Config.cmake)
-ENDIF(EXISTS ${PROJECT_CMAKE}/Hdf5Config.cmake)
-
-IF(Hdf5_INCLUDE_DIRS)
-
-  FIND_PATH(HDF5_INCLUDE_DIR hdf5.h ${Hdf5_INCLUDE_DIRS})
-  FIND_LIBRARY(HDF5_LIBRARY hdf5_cpp ${Hdf5_LIBRARY_DIRS})
-  SET(HDF5_LIBRARIES ${HDF5_LIBRARY} ${HDF5_LIBRARIES})
-  FIND_LIBRARY(HDF5_LIBRARY hdf5 ${Hdf5_LIBRARY_DIRS})
-  SET(HDF5_LIBRARIES ${HDF5_LIBRARY} ${HDF5_LIBRARIES})
-
-ELSE(Hdf5_INCLUDE_DIRS)
-
-  SET(TRIAL_LIBRARY_PATHS
-    $ENV{HDF5_HOME}/lib
-    /usr/apps/lib
-    /usr/lib 
-    /usr/local/lib
-    /opt/lib
-    /sw/lib
-    )
-
-  SET(TRIAL_INCLUDE_PATHS
-    $ENV{HDF5_HOME}/include
-    /usr/apps/include
-    /usr/include
-    /opt/include
-    /usr/local/include
-    /sw/include
-    )
-
-  IF($ENV{HDF5_DIR} MATCHES "hdf")
-    MESSAGE(STATUS "Using environment variable HDF5_DIR.")
-    SET(TRIAL_LIBRARY_PATHS $ENV{HDF5_DIR}/lib ${TRIAL_LIBRARY_PATHS} )
-    SET(TRIAL_INCLUDE_PATHS $ENV{HDF5_DIR}/include ${TRIAL_INCLUDE_PATHS} )
-  ENDIF($ENV{HDF5_DIR} MATCHES "hdf")
- 
-  FIND_LIBRARY(HDF5_LIBRARY hdf5 ${TRIAL_LIBRARY_PATHS})
-  SET(HDF5_LIBRARIES ${HDF5_LIBRARY} ${HDF5_LIBRARIES})
- 
-  FIND_LIBRARY(HDF5HL_LIBRARY hdf5_hl  ${TRIAL_LIBRARY_PATHS})
-  SET(HDF5_LIBRARIES ${HDF5HL_LIBRARY} ${HDF5_LIBRARIES})
-  FIND_PATH(HDF5_INCLUDE_DIR hdf5.h ${TRIAL_INCLUDE_PATHS} )
-  MESSAGE(STATUS "Found: " ${HDF5_LIBRARY})
-
-ENDIF(Hdf5_INCLUDE_DIRS)
-
-IF(HDF5_INCLUDE_DIR AND HDF5_LIBRARY)
-  SET(FOUND_HDF5 1 CACHE BOOL "Found hdf5 library")
-ELSE(HDF5_INCLUDE_DIR AND HDF5_LIBRARY)
-  SET(FOUND_HDF5 0 CACHE BOOL "Not fount hdf5 library")
-ENDIF(HDF5_INCLUDE_DIR AND HDF5_LIBRARY)
-
-MARK_AS_ADVANCED(
-  HDF5_INCLUDE_DIR 
-  HDF5_LIBRARY 
-  FOUND_HDF5
-)