diff options
author | Dana Robinson <derobins@hdfgroup.org> | 2015-10-26 04:49:56 (GMT) |
---|---|---|
committer | Dana Robinson <derobins@hdfgroup.org> | 2015-10-26 04:49:56 (GMT) |
commit | 8a1ca95768c7f4017372419432d370468421a617 (patch) | |
tree | f9ccb7bcadee95580ca5de43a0a4da3a04d84cba /MANIFEST | |
parent | c07ff78058eae9daeac192b77ede730bce51d252 (diff) | |
download | hdf5-8a1ca95768c7f4017372419432d370468421a617.zip hdf5-8a1ca95768c7f4017372419432d370468421a617.tar.gz hdf5-8a1ca95768c7f4017372419432d370468421a617.tar.bz2 |
[svn-r28216] Merge of r27969:28132, 28144:28193 from trunk.
Mostly CMake changes, but there's also a few minor library
changes.
Temporarily commented out the accum test. The test builds
but one of the sub-tests fails due to a file issue.
Tested on: Ubuntu 15.04 (Linux 3.19 x86_64) gcc 4.9.2
serial w/autotools
serial w/CMake (3.3.2, w/ fortran and C++)
Diffstat (limited to 'MANIFEST')
-rw-r--r-- | MANIFEST | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -32,7 +32,7 @@ ./README.txt ./BRANCH.txt ./acsite.m4 -./autogen.sh +./autogen.sh ./configure.ac ./bin/COPYING @@ -2664,4 +2664,4 @@ # CMake-specific User Scripts ./config/cmake/scripts/CTestScript.cmake -./config/cmake/scripts/HDF518config.cmake +./config/cmake/scripts/HDF5config.cmake |