diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2013-01-31 17:30:34 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2013-01-31 17:30:34 (GMT) |
| commit | 13693b307c08f962d5416316b1c154bb0058529a (patch) | |
| tree | 58b31c633ccd8181d94c0cc8ae9dfee8d7098561 /config | |
| parent | bf473b40f57317fa60640f44c735133f58023f6a (diff) | |
| download | hdf5-13693b307c08f962d5416316b1c154bb0058529a.zip hdf5-13693b307c08f962d5416316b1c154bb0058529a.tar.gz hdf5-13693b307c08f962d5416316b1c154bb0058529a.tar.bz2 | |
[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
Diffstat (limited to 'config')
| -rwxr-xr-x | config/cmake/CTestCustom.cmake | 1 | ||||
| -rw-r--r-- | config/cmake/HDF5UseFortran.cmake | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/config/cmake/CTestCustom.cmake b/config/cmake/CTestCustom.cmake index f87f246..1baf580 100755 --- a/config/cmake/CTestCustom.cmake +++ b/config/cmake/CTestCustom.cmake @@ -13,6 +13,7 @@ SET (CTEST_CUSTOM_WARNING_EXCEPTION "disabling jobserver mode" "config.cmake.xlatefile.c" "warning.*implicit declaration of function" + "note: expanded from macro" # "fpp:[ \t]*warning:[ \t]*cannot remove H5_DEBUG_API - not a predefined macro" ) diff --git a/config/cmake/HDF5UseFortran.cmake b/config/cmake/HDF5UseFortran.cmake index 323c9ef..8fa76b8 100644 --- a/config/cmake/HDF5UseFortran.cmake +++ b/config/cmake/HDF5UseFortran.cmake @@ -110,6 +110,9 @@ CHECK_FORTRAN_FEATURE(RealIsNotDouble FORTRAN_DEFAULT_REAL_NOT_DOUBLE ) +#----------------------------------------------------------------------------- +# Checks if the ISO_C_BINDING module meets all the requirements +#----------------------------------------------------------------------------- CHECK_FORTRAN_FEATURE(iso_c_binding " PROGRAM main @@ -117,6 +120,7 @@ CHECK_FORTRAN_FEATURE(iso_c_binding IMPLICIT NONE TYPE(C_PTR) :: ptr TYPE(C_FUNPTR) :: funptr + INTEGER(C_INT64_T) :: c_int64_type CHARACTER(LEN=80, KIND=c_char), TARGET :: ichr ptr = C_LOC(ichr(1:1)) END PROGRAM |