[svn-r22632] Merge from trunk revision 22631

tested: local linux

1 files changed, 14 insertions, 13 deletions

diff --git a/config/cmake/FindHDF5.cmake b/config/cmake/FindHDF5.cmake.in
index 33532b0..1b51ed4 100644
--- a/config/cmake/FindHDF5.cmake
+++ b/config/cmake/FindHDF5.cmake.in
@@ -1,5 +1,5 @@
 #

-# To be used by projects that make use of Cmakeified hdf5-1.8

+# To be used by projects that make use of Cmakeified hdf5-@HDF5_PACKAGE_VERSION@

 #

 

 #

@@ -10,9 +10,9 @@
 # HDF5_FOUND               - True if found, otherwise all other vars are undefined

 # HDF5_INCLUDE_DIR         - The include dir for main *.h files

 # HDF5_FORTRAN_INCLUDE_DIR - The include dir for fortran modules and headers

-# HDF5_VERSION_STRING      - full version (e.g. 1.8.5)

-# HDF5_VERSION_MAJOR       - major part of version (e.g. 1.8)

-# HDF5_VERSION_MINOR       - minor part (e.g. 5)

+# HDF5_VERSION_STRING      - full version (e.g. @HDF5_PACKAGE_VERSION@)

+# HDF5_VERSION_MAJOR       - major part of version (e.g. @HDF5_PACKAGE_VERSION_MAJOR@)

+# HDF5_VERSION_MINOR       - minor part (e.g. @HDF5_PACKAGE_VERSION_MINOR@)

 # 

 # The following boolean vars will be defined

 # HDF5_ENABLE_PARALLEL  - 1 if HDF5 parallel supported

@@ -36,7 +36,7 @@
 # hdf5_hl_cpp       : High Level cpp interface library

 # 

 # To aid in finding HDF5 as part of a subproject set

-# HDF5_ROOT_DIR_HINT to the location where hdf5-config.cmake lies

+# HDF5_ROOT_DIR_HINT to the location where @HDF5_PACKAGE@@HDF_PACKAGE_EXT@-config.cmake lies

 

 INCLUDE (SelectLibraryConfigurations)

 INCLUDE (FindPackageHandleStandardArgs)

@@ -53,18 +53,19 @@ SET (_HDF5_PATHS
     $ENV{HOME}/.local

     $ENV{HDF5_ROOT}

     $ENV{HDF5_ROOT_DIR_HINT}

-    /usr/lib/hdf5

-    /usr/share/hdf5

-    /usr/local/hdf5

-    /usr/local/hdf5/share

+    /usr/lib/@HDF5_PACKAGE@

+    /usr/share/@HDF5_PACKAGE@

+    /usr/local/@HDF5_PACKAGE@

+    /usr/local/@HDF5_PACKAGE@/share

 )

 

-FIND_PATH (HDF5_ROOT_DIR "hdf5-config.cmake"

+FIND_PATH (HDF5_ROOT_DIR "@HDF5_PACKAGE@@HDF_PACKAGE_EXT@-config.cmake"

     HINTS ${_HDF5_HINTS}

     PATHS ${_HDF5_PATHS}

     PATH_SUFFIXES

-        lib/cmake/hdf5

-        share/cmake/hdf5

+        cmake/@HDF5_PACKAGE@

+        lib/cmake/@HDF5_PACKAGE@

+        share/cmake/@HDF5_PACKAGE@

 )

 

 FIND_PATH (HDF5_INCLUDE_DIRS "H5public.h"

@@ -81,5 +82,5 @@ SET ( HDF5_INCLUDE_DIR "${HDF5_INCLUDE_DIRS}" )
 

 IF (HDF5_INCLUDE_DIR)

   SET (HDF5_FOUND "YES")

-  INCLUDE (${HDF5_ROOT_DIR}/hdf5-config.cmake)

+  INCLUDE (${HDF5_ROOT_DIR}/@HDF5_PACKAGE@@HDF_PACKAGE_EXT@-config.cmake)

 ENDIF (HDF5_INCLUDE_DIR)