[svn-r23211] Merge trunk CMake changes for minimum cmake version of 2.8.10. This was prompted by HDFFV-8227, OS X requires latest version of cmake for proper support.

Tested: local linux

6 files changed, 64 insertions, 19 deletions

diff --git a/fortran/CMakeLists.txt b/fortran/CMakeLists.txt
index d18cdb4..9dbe8ca 100644
--- a/fortran/CMakeLists.txt
+++ b/fortran/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 2.8.6)
+cmake_minimum_required (VERSION 2.8.10)
 PROJECT (HDF5_F90 C CXX Fortran)
 
 IF (H5_HAVE_PARALLEL)
diff --git a/fortran/examples/CMakeLists.txt b/fortran/examples/CMakeLists.txt
index 814da48..2d35f89 100644
--- a/fortran/examples/CMakeLists.txt
+++ b/fortran/examples/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 2.8.6)
+cmake_minimum_required (VERSION 2.8.10)
 PROJECT (HDF5_F90_EXAMPLES C CXX Fortran)
 # --------------------------------------------------------------------
 # Notes: When creating examples they should be prefixed
diff --git a/fortran/src/CMakeLists.txt b/fortran/src/CMakeLists.txt
index 25e14ba..3a47233 100644
--- a/fortran/src/CMakeLists.txt
+++ b/fortran/src/CMakeLists.txt
@@ -1,7 +1,23 @@
-cmake_minimum_required (VERSION 2.8.6)
+cmake_minimum_required (VERSION 2.8.10)
 PROJECT (HDF5_F90_SRC C CXX Fortran)
 
 #-----------------------------------------------------------------------------
+# configure def file for shared libs on windows
+IF (WIN32 AND NOT CYGWIN)
+  IF (BUILD_SHARED_LIBS)
+    IF (MSVC)
+      IF (NOT H5_HAVE_PARALLEL)
+        SET (H5_NOPAREXP ";")
+      ENDIF (NOT H5_HAVE_PARALLEL)
+      IF (NOT HDF5_ENABLE_F2003)
+        SET (H5_NOF03EXP ";")
+      ENDIF (NOT HDF5_ENABLE_F2003)
+      CONFIGURE_FILE (${HDF5_F90_SRC_SOURCE_DIR}/hdf5_fortrandll.def.in ${HDF5_F90_SRC_BINARY_DIR}/hdf5_fortrandll.def @ONLY)
+    ENDIF (MSVC)
+  ENDIF (BUILD_SHARED_LIBS)
+ENDIF (WIN32 AND NOT CYGWIN)
+
+#-----------------------------------------------------------------------------
 # Setup the Fortran auto-detection utilities
 # H5test_kind(_SIZEOF).f90 used to generate H5fortran_detect.f90
 # H5fortran_detect.f90     used to generate H5fort_type_defines.h
@@ -208,11 +224,7 @@ IF (WIN32 AND NOT CYGWIN)
         BUILD_HDF5_DLL
     )
     IF (MSVC)
-      IF (H5_HAVE_PARALLEL)
-        SET (SHARED_LINK_FLAGS "/DLL /DEF:${HDF5_F90_SRC_SOURCE_DIR}/phdf5_fortrandll.def")
-      ELSE (H5_HAVE_PARALLEL)
-        SET (SHARED_LINK_FLAGS "/DLL /DEF:${HDF5_F90_SRC_SOURCE_DIR}/hdf5_fortrandll.def")
-      ENDIF (H5_HAVE_PARALLEL)
+      SET (SHARED_LINK_FLAGS "/DLL /DEF:${HDF5_F90_SRC_BINARY_DIR}/hdf5_fortrandll.def")
     ENDIF (MSVC)
   ENDIF (BUILD_SHARED_LIBS)
   SET_PROPERTY (TARGET ${HDF5_F90_LIB_TARGET}
diff --git a/fortran/src/phdf5_fortrandll.def b/fortran/src/hdf5_fortrandll.def.in
index 2beca21..bf7596d 100644
--- a/fortran/src/phdf5_fortrandll.def
+++ b/fortran/src/hdf5_fortrandll.def.in
@@ -6,6 +6,7 @@ H5LIB_mp_H5GET_LIBVERSION_F
 H5LIB_mp_H5CHECK_VERSION_F

 H5LIB_mp_H5GARBAGE_COLLECT_F

 H5LIB_mp_H5DONT_ATEXIT_F

+@H5_NOF03EXP@H5LIB_PROVISIONAL_mp_H5OFFSETOF

 ; H5_DBLE_INTERFACE

 H5_DBLE_INTERFACE_mp_H5AREAD_DOUBLE_SCALAR

 H5_DBLE_INTERFACE_mp_H5AREAD_DOUBLE_1

@@ -120,6 +121,8 @@ H5A_mp_H5AEXISTS_F
 H5A_mp_H5AEXISTS_BY_NAME_F

 H5A_mp_H5AOPEN_BY_NAME_F

 H5A_mp_H5ARENAME_F

+@H5_NOF03EXP@H5A_PROVISIONAL_mp_H5AWRITE_PTR

+@H5_NOF03EXP@H5A_PROVISIONAL_mp_H5AREAD_PTR

 ; H5D

 H5D_mp_H5DCREATE_F

 H5D_mp_H5DOPEN_F

@@ -200,6 +203,9 @@ H5D_mp_H5DGET_CREATE_PLIST_F
 H5D_mp_H5DGET_STORAGE_SIZE_F

 H5D_mp_H5DVLEN_GET_MAX_LEN_F

 H5D_mp_H5DGET_ACCESS_PLIST_F

+@H5_NOF03EXP@H5D_PROVISIONAL_mp_H5DWRITE_PTR

+@H5_NOF03EXP@H5D_PROVISIONAL_mp_H5DREAD_PTR

+@H5_NOF03EXP@H5D_PROVISIONAL_mp_H5DVLEN_RECLAIM_F

 ; H5E

 H5E_mp_H5ECLEAR_F

 H5E_mp_H5EPRINT_F

@@ -283,11 +289,27 @@ H5L_mp_H5LGET_INFO_BY_IDX_F
 H5L_mp_H5LIS_REGISTERED_F

 H5L_mp_H5LMOVE_F

 H5L_mp_H5LGET_NAME_BY_IDX_F

+@H5_NOF03EXP@H5L_PROVISIONAL_mp_H5LITERATE_F

+@H5_NOF03EXP@H5L_PROVISIONAL_mp_H5LITERATE_BY_NAME_F

 ; H5O

+H5O_mp_H5OCLOSE_F

 H5O_mp_H5OCOPY_F

+H5O_mp_H5ODECR_REFCOUNT_F

+H5O_mp_H5OEXISTS_BY_NAME_F

+H5O_mp_H5OGET_COMMENT_F

+H5O_mp_H5OGET_COMMENT_BY_NAME_F

+H5O_mp_H5OINCR_REFCOUNT_F

 H5O_mp_H5OLINK_F

-H5O_mp_H5OOPEN_F

 H5O_mp_H5OOPEN_BY_ADDR_F

+H5O_mp_H5OOPEN_BY_IDX_F

+H5O_mp_H5OOPEN_F

+H5O_mp_H5OSET_COMMENT_F

+H5O_mp_H5OSET_COMMENT_BY_NAME_F

+@H5_NOF03EXP@H5O_PROVISIONAL_mp_H5OGET_INFO_BY_IDX_F

+@H5_NOF03EXP@H5O_PROVISIONAL_mp_H5OGET_INFO_BY_NAME_F

+@H5_NOF03EXP@H5O_PROVISIONAL_mp_H5OGET_INFO_F

+@H5_NOF03EXP@H5O_PROVISIONAL_mp_H5OVISIT_BY_NAME_F

+@H5_NOF03EXP@H5O_PROVISIONAL_mp_H5OVISIT_F

 ; H5P

 H5P_mp_H5PCREATE_F

 H5P_mp_H5PSET_PRESERVE_F

@@ -424,16 +446,26 @@ H5P_mp_H5PGET_NLINKS_F
 H5P_mp_H5PGET_CREATE_INTER_GROUP_F

 H5P_mp_H5PSET_CHUNK_CACHE_F

 H5P_mp_H5PGET_CHUNK_CACHE_F

+@H5_NOF03EXP@H5P_PROVISIONAL_mp_H5PSET_FILL_VALUE_PTR

+@H5_NOF03EXP@H5P_PROVISIONAL_mp_H5PGET_FILL_VALUE_PTR

+@H5_NOF03EXP@H5P_PROVISIONAL_mp_H5PSET_PTR

+@H5_NOF03EXP@H5P_PROVISIONAL_mp_H5PGET_PTR

+@H5_NOF03EXP@H5P_PROVISIONAL_mp_H5PREGISTER_PTR

+@H5_NOF03EXP@H5P_PROVISIONAL_mp_H5PINSERT_PTR

 ; H5R

 H5R_PROVISIONAL_mp_H5RCREATE_OBJECT_F

 H5R_PROVISIONAL_mp_H5RCREATE_REGION_F

 H5R_PROVISIONAL_mp_H5RDEREFERENCE_OBJECT_F

 H5R_PROVISIONAL_mp_H5RDEREFERENCE_REGION_F

 H5R_PROVISIONAL_mp_H5RGET_REGION_REGION_F

-

 H5R_mp_H5RGET_OBJECT_TYPE_OBJ_F

 H5R_PROVISIONAL_mp_H5RGET_NAME_OBJECT_F

 H5R_PROVISIONAL_mp_H5RGET_NAME_REGION_F

+@H5_NOF03EXP@H5R_PROVISIONAL_mp_H5RGET_REGION_PTR_F

+@H5_NOF03EXP@H5R_PROVISIONAL_mp_H5RCREATE_PTR_F

+@H5_NOF03EXP@H5R_PROVISIONAL_mp_H5RDEREFERENCE_PTR_F

+@H5_NOF03EXP@H5R_PROVISIONAL_mp_H5RGET_NAME_PTR_F

+@H5_NOF03EXP@H5R_PROVISIONAL_mp_H5RGET_OBJ_TYPE_F

 ; H5S

 H5S_mp_H5SCREATE_SIMPLE_F

 H5S_mp_H5SCLOSE_F

@@ -523,15 +555,16 @@ H5T_mp_H5TENCODE_F
 H5T_mp_H5TGET_CREATE_PLIST_F

 H5T_mp_H5TCOMPILER_CONV_F

 H5T_mp_H5TGET_NATIVE_TYPE_F

+@H5_NOF03EXP@H5T_PROVISIONAL_mp_H5TCONVERT_F

 ; H5Z

 H5Z_mp_H5ZUNREGISTER_F

 H5Z_mp_H5ZFILTER_AVAIL_F

 H5Z_mp_H5ZGET_FILTER_INFO_F

 ; Parallel

-H5FDMPIO_mp_H5PSET_FAPL_MPIO_F

-H5FDMPIO_mp_H5PGET_FAPL_MPIO_F

-H5FDMPIO_mp_H5PSET_DXPL_MPIO_F

-H5FDMPIO_mp_H5PGET_DXPL_MPIO_F

-H5FDMPIO_mp_H5PSET_FAPL_MPIPOSIX_F

-H5FDMPIO_mp_H5PGET_FAPL_MPIPOSIX_F

-H5FDMPIO_mp_H5PGET_MPIO_ACTUAL_IO_MODE_F
\ No newline at end of file
+@H5_NOPAREXP@H5FDMPIO_mp_H5PSET_FAPL_MPIO_F

+@H5_NOPAREXP@H5FDMPIO_mp_H5PGET_FAPL_MPIO_F

+@H5_NOPAREXP@H5FDMPIO_mp_H5PSET_DXPL_MPIO_F

+@H5_NOPAREXP@H5FDMPIO_mp_H5PGET_DXPL_MPIO_F

+@H5_NOPAREXP@H5FDMPIO_mp_H5PSET_FAPL_MPIPOSIX_F

+@H5_NOPAREXP@H5FDMPIO_mp_H5PGET_FAPL_MPIPOSIX_F

+@H5_NOPAREXP@H5FDMPIO_mp_H5PGET_MPIO_ACTUAL_IO_MODE_F

diff --git a/fortran/test/CMakeLists.txt b/fortran/test/CMakeLists.txt
index d19baea..3911bb9 100644
--- a/fortran/test/CMakeLists.txt
+++ b/fortran/test/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 2.8.6)
+cmake_minimum_required (VERSION 2.8.10)
 PROJECT (HDF5_FORTRAN_TESTS C CXX Fortran)
 
 #-----------------------------------------------------------------------------
diff --git a/fortran/testpar/CMakeLists.txt b/fortran/testpar/CMakeLists.txt
index b112db3..1c7248c 100644
--- a/fortran/testpar/CMakeLists.txt
+++ b/fortran/testpar/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 2.8.6)
+cmake_minimum_required (VERSION 2.8.10)
 PROJECT (HDF5_FORTRAN_TESTPAR C CXX Fortran)
 
 #-----------------------------------------------------------------------------