summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScot Breitenfeld <brtnfld@hdfgroup.org>2014-06-16 16:56:01 (GMT)
committerScot Breitenfeld <brtnfld@hdfgroup.org>2014-06-16 16:56:01 (GMT)
commit7d3ff84d5959e2ce9ebb40d99fab3a7b691c5080 (patch)
tree634c0745a27ac3ebea45193ead44134cbd2d82d2
parent9cf084492894061d70f6c4d1fe502789e533d1d9 (diff)
downloadhdf5-7d3ff84d5959e2ce9ebb40d99fab3a7b691c5080.zip
hdf5-7d3ff84d5959e2ce9ebb40d99fab3a7b691c5080.tar.gz
hdf5-7d3ff84d5959e2ce9ebb40d99fab3a7b691c5080.tar.bz2
[svn-r25291] Fix for:
HDFFV-8653 replace non-standard sizeof in the fortran tests with c_sizeof
-rw-r--r--fortran/test/CMakeLists.txt7
1 files changed, 6 insertions, 1 deletions
diff --git a/fortran/test/CMakeLists.txt b/fortran/test/CMakeLists.txt
index 7c31fe4..d10f2ef 100644
--- a/fortran/test/CMakeLists.txt
+++ b/fortran/test/CMakeLists.txt
@@ -21,10 +21,15 @@ set_target_properties (${HDF5_F90_C_TEST_LIB_TARGET} PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
)
+# See if the F2008 intrinsic STORAGE_SIZE and C_SIZEOF are supported. If not then
+# fall back to F2003. If F2003 not supported then use F90 for the tests.
+
if (FORTRAN_HAVE_STORAGE_SIZE AND FORTRAN_HAVE_C_SIZEOF)
add_library (${HDF5_F90_TEST_LIB_TARGET} ${LIB_TYPE} tf_F08.f90 tf.f90)
-else (FORTRAN_HAVE_STORAGE_SIZE AND FORTRAN_HAVE_C_SIZEOF)
+elseif (HDF5_ENABLE_F2003)
add_library (${HDF5_F90_TEST_LIB_TARGET} ${LIB_TYPE} tf_F03.f90 tf.f90)
+else (FORTRAN_HAVE_STORAGE_SIZE AND FORTRAN_HAVE_C_SIZEOF)
+ add_library (${HDF5_F90_TEST_LIB_TARGET} ${LIB_TYPE} tf_F90.f90 tf.f90)
endif (FORTRAN_HAVE_STORAGE_SIZE AND FORTRAN_HAVE_C_SIZEOF)