diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2015-09-22 20:44:16 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2015-09-22 20:44:16 (GMT) |
| commit | 8a170f1c61b5ec79d6cd8a5d271e6db93483bb49 (patch) | |
| tree | 45a85ab551ad2498ffc16bcc0e8b9b2bb81691ab /c++ | |
| parent | a2f7a8f34be5618880a0a965e3d9a2489c266029 (diff) | |
| download | hdf5-8a170f1c61b5ec79d6cd8a5d271e6db93483bb49.zip hdf5-8a170f1c61b5ec79d6cd8a5d271e6db93483bb49.tar.gz hdf5-8a170f1c61b5ec79d6cd8a5d271e6db93483bb49.tar.bz2 | |
[svn-r27859] Merged revisions
27625, 27627, 27647, 27648, 27661, 27668, 27670, 27671, 27674, 27676,
27703, 27716, 27720, 27747, 27754, 27755
from the trunk.
Mostly CMake and Fortran changes.
Tested on: jam (w/ gcc/gfortran 4.9.3)
Diffstat (limited to 'c++')
| -rw-r--r-- | c++/Makefile.in | 1 | ||||
| -rw-r--r-- | c++/examples/Makefile.in | 1 | ||||
| -rw-r--r-- | c++/src/Makefile.in | 1 | ||||
| -rw-r--r-- | c++/test/Makefile.in | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/c++/Makefile.in b/c++/Makefile.in index 4ff4906..ff18fff 100644 --- a/c++/Makefile.in +++ b/c++/Makefile.in @@ -458,6 +458,7 @@ FORTRAN_C_LONG_DOUBLE_IS_UNIQUE = @FORTRAN_C_LONG_DOUBLE_IS_UNIQUE@ FORTRAN_HAVE_C_LONG_DOUBLE = @FORTRAN_HAVE_C_LONG_DOUBLE@ FORTRAN_SIZEOF_LONG_DOUBLE = @FORTRAN_SIZEOF_LONG_DOUBLE@ FSEARCH_DIRS = @FSEARCH_DIRS@ +Fortran_COMPILER_ID = @Fortran_COMPILER_ID@ GREP = @GREP@ H5CONFIG_F_IKIND = @H5CONFIG_F_IKIND@ H5CONFIG_F_NUM_IKIND = @H5CONFIG_F_NUM_IKIND@ diff --git a/c++/examples/Makefile.in b/c++/examples/Makefile.in index 9691b5e..1d7dcbe 100644 --- a/c++/examples/Makefile.in +++ b/c++/examples/Makefile.in @@ -406,6 +406,7 @@ FORTRAN_C_LONG_DOUBLE_IS_UNIQUE = @FORTRAN_C_LONG_DOUBLE_IS_UNIQUE@ FORTRAN_HAVE_C_LONG_DOUBLE = @FORTRAN_HAVE_C_LONG_DOUBLE@ FORTRAN_SIZEOF_LONG_DOUBLE = @FORTRAN_SIZEOF_LONG_DOUBLE@ FSEARCH_DIRS = @FSEARCH_DIRS@ +Fortran_COMPILER_ID = @Fortran_COMPILER_ID@ GREP = @GREP@ H5CONFIG_F_IKIND = @H5CONFIG_F_IKIND@ H5CONFIG_F_NUM_IKIND = @H5CONFIG_F_NUM_IKIND@ diff --git a/c++/src/Makefile.in b/c++/src/Makefile.in index f2e59b2..cd72f6a 100644 --- a/c++/src/Makefile.in +++ b/c++/src/Makefile.in @@ -469,6 +469,7 @@ FORTRAN_C_LONG_DOUBLE_IS_UNIQUE = @FORTRAN_C_LONG_DOUBLE_IS_UNIQUE@ FORTRAN_HAVE_C_LONG_DOUBLE = @FORTRAN_HAVE_C_LONG_DOUBLE@ FORTRAN_SIZEOF_LONG_DOUBLE = @FORTRAN_SIZEOF_LONG_DOUBLE@ FSEARCH_DIRS = @FSEARCH_DIRS@ +Fortran_COMPILER_ID = @Fortran_COMPILER_ID@ GREP = @GREP@ H5CONFIG_F_IKIND = @H5CONFIG_F_IKIND@ H5CONFIG_F_NUM_IKIND = @H5CONFIG_F_NUM_IKIND@ diff --git a/c++/test/Makefile.in b/c++/test/Makefile.in index e487e54..380bd32 100644 --- a/c++/test/Makefile.in +++ b/c++/test/Makefile.in @@ -460,6 +460,7 @@ FORTRAN_C_LONG_DOUBLE_IS_UNIQUE = @FORTRAN_C_LONG_DOUBLE_IS_UNIQUE@ FORTRAN_HAVE_C_LONG_DOUBLE = @FORTRAN_HAVE_C_LONG_DOUBLE@ FORTRAN_SIZEOF_LONG_DOUBLE = @FORTRAN_SIZEOF_LONG_DOUBLE@ FSEARCH_DIRS = @FSEARCH_DIRS@ +Fortran_COMPILER_ID = @Fortran_COMPILER_ID@ GREP = @GREP@ H5CONFIG_F_IKIND = @H5CONFIG_F_IKIND@ H5CONFIG_F_NUM_IKIND = @H5CONFIG_F_NUM_IKIND@ |