diff options
| author | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2014-07-18 22:17:58 (GMT) |
|---|---|---|
| committer | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2014-07-18 22:17:58 (GMT) |
| commit | 442f9854645775a2bc7b20efe2170fb5a15ea29b (patch) | |
| tree | be5df249ef8c9d178797bc1be422f251192de8cf /fortran/test/CMakeLists.txt | |
| parent | b79ca69a25aa612a97bc0aaa13710a2bf27a6376 (diff) | |
| download | hdf5-442f9854645775a2bc7b20efe2170fb5a15ea29b.zip hdf5-442f9854645775a2bc7b20efe2170fb5a15ea29b.tar.gz hdf5-442f9854645775a2bc7b20efe2170fb5a15ea29b.tar.bz2 | |
[svn-r25433] Brought changes from the trunk into the branch.
For the top level, brings in changes for configure.ac, configure and the MANIFEST:
svn merge -c25286 https://svn.hdfgroup.uiuc.edu/hdf5/trunk .
svn merge -c25287 https://svn.hdfgroup.uiuc.edu/hdf5/trunk .
svn merge -c25290 https://svn.hdfgroup.uiuc.edu/hdf5/trunk .
For the fortran level:
384 17:00 svn merge -r25235:25272 https://svn.hdfgroup.uiuc.edu/hdf5/trunk/fortran
389 17:01 svn merge -r25284:25432 https://svn.hdfgroup.uiuc.edu/hdf5/trunk/fortran
For the fortran merges, I skipped changes relating to hyperslab selection since the C source has not been merged from the trunk yet. These changes should be in place in the fortran source when the C source is merged to the 1.8 branch.
Diffstat (limited to 'fortran/test/CMakeLists.txt')
| -rw-r--r-- | fortran/test/CMakeLists.txt | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/fortran/test/CMakeLists.txt b/fortran/test/CMakeLists.txt index 28b2ae1..d10f2ef 100644 --- a/fortran/test/CMakeLists.txt +++ b/fortran/test/CMakeLists.txt @@ -21,7 +21,18 @@ set_target_properties (${HDF5_F90_C_TEST_LIB_TARGET} PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>" ) -add_library (${HDF5_F90_TEST_LIB_TARGET} ${LIB_TYPE} tf.f90) +# 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) +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) + + set (SHARED_LINK_FLAGS " ") if (WIN32) if (BUILD_SHARED_LIBS) |