Changeset 1759

Timestamp:

15/11/11 14:50:18 (6 months ago)

Author:

Freddie Akeroyd

Message:

Add back in API compatibility defines - needed if HDF5-1.8 has been
installed with H5_USE_16_API_DEFAULT enabled Refs #303

Location:

trunk

Files:

• CMakeLists.txt (modified) (1 diff)
• configure.ac (modified) (2 diffs)

trunk/CMakeLists.txt

@@ -140 +140 @@
 if (HDF5_FOUND)
 #   set (HDF5_CPP "-DHDF5 -DH5_USE_16_API")
-   set (HDF5_CPP "-DHDF5 -DH5_NO_DEPRECATED_SYMBOLS")
+#   these are needed if HDF5 1.8 has been instaleld with H5_USE_16_API_DEFAULT 
+  set(HDF5_API_DEFS "-DH5Acreate_vers=2 -DH5Aiterate_vers=2 -DH5Dcreate_vers=2 -DH5Dopen_vers=2 -DH5Eclear_vers=2 -DH5Eprint_vers=2 -DH5Epush_vers=2 -DH5Eset_auto_vers=2 -DH5Eget_auto_vers=2 -DH5Ewalk_vers=2 -DH5Gcreate_vers=2 -DH5Gopen_vers=2 -DH5Pget_filter_vers=2 -DH5Pget_filter_by_id_vers=2 -DH5Pinsert_vers=2 -DH5Pregister_vers=2 -DH5Rget_obj_type_vers=2 -DH5Tarray_create_vers=2 -DH5Tcommit_vers=2 -DH5Tget_array_dims_vers=2 -DH5Topen_vers=2")
+   set (HDF5_CPP "-DHDF5 -DH5_NO_DEPRECATED_SYMBOLS ${HDF5_API_DEFS}")
 endif (HDF5_FOUND)
 

trunk/configure.ac

@@ -573 +573 @@
     fi
 fi
+# these are needed if HDF5 1.8 has been instaleld with H5_USE_16_API_DEFAULT 
+HDF5_API_DEFS="-DH5Acreate_vers=2 -DH5Aiterate_vers=2 -DH5Dcreate_vers=2 -DH5Dopen_vers=2 -DH5Eclear_vers=2 -DH5Eprint_vers=2 -DH5Epush_vers=2 -DH5Eset_auto_vers=2 -DH5Eget_auto_vers=2 -DH5Ewalk_vers=2 -DH5Gcreate_vers=2 -DH5Gopen_vers=2 -DH5Pget_filter_vers=2 -DH5Pget_filter_by_id_vers=2 -DH5Pinsert_vers=2 -DH5Pregister_vers=2 -DH5Rget_obj_type_vers=2 -DH5Tarray_create_vers=2 -DH5Tcommit_vers=2 -DH5Tget_array_dims_vers=2 -DH5Topen_vers=2"
 if test "$H5ROOT"; then
     H5VERSION=`grep H5_VERS_INFO ${H5ROOT}/include/H5public.h | cut -d '"' -f 2 | cut -d ' ' -f 4`
@@ -586 +588 @@
                 EXTRA_LDPATH="$EXTRA_LDPATH $HDF5_LDFLAGS"
                 HDF5_LDFLAGS="$HDF5_LDFLAGS -lhdf5 -lz"
-                HDF5_CPPFLAGS="-I$H5ROOT/include -DHDF5 -DH5_NO_DEPRECATED_SYMBOLS"
+                HDF5_CPPFLAGS="-I$H5ROOT/include -DHDF5 -DH5_NO_DEPRECATED_SYMBOLS ${HDF5_API_DEFS}"
                 ;;
         *)      AC_MSG_WARN([The HDF 5 installation has not the right version ($H5VERSION). You need at least 1.6])