diff options
author | Jordan Henderson <jhenderson@hdfgroup.org> | 2017-07-05 13:05:02 (GMT) |
---|---|---|
committer | Jordan Henderson <jhenderson@hdfgroup.org> | 2017-07-05 13:05:02 (GMT) |
commit | 34fac7abb0c48f3118572176902d92c739973ca3 (patch) | |
tree | c6a301af857292b1de3828c0131b1437e187b913 /CMakeLists.txt | |
parent | 92759cc3b9f67f0ca913f190bd9bc5a5249455be (diff) | |
parent | 6428a637752753cc8a9007c0c3c38b9ea9cc97fd (diff) | |
download | hdf5-34fac7abb0c48f3118572176902d92c739973ca3.zip hdf5-34fac7abb0c48f3118572176902d92c739973ca3.tar.gz hdf5-34fac7abb0c48f3118572176902d92c739973ca3.tar.bz2 |
Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '6428a637752753cc8a9007c0c3c38b9ea9cc97fd': (165 commits)
Skip HDFFV-10160 filenotclosed test for split/multi driver Temporary skip this test for split/multi driver. Further investigation to resolve the failure is needed. Please enter the commit message for your changes. Lines starting
More minor whitespace cleanup
Fixed a minor comment typo in H5R.c
* Reverted removal of H5I_REFERENCE to avoid breaking binary compatibility. * Added a quick H5I_REFERENCE smoke check to test_misc19() in tmisc.c.
Added missing free() call to test_misc19().
Purged the unused H5I_REFERENCE from the library.
Added a test for VFD IDs to testhdf5.
Revert "Partial removal of NDEBUG ifdefs from the library."
Partial removal of NDEBUG ifdefs from the library.
Removed compiler flag cleanup since Solaris chokes on it.
Fix for HDFFV-10160 Modifications to fix the assertion/abort failure when the application does not close the file.
Fixed a bug in autotools Fortran processing where a test for the presence of a C long double type always returned true.
Updated the --enable-debug/production handling in configure.ac so that it more reliably indicates that the configure option can no longer be used. Previously, using --enable-debug="", etc. would not trigger an error (even though such usage is unlikely).
Added awk processing to remove extraneous whitespace from H5_ flags in configure.
Fixed a comment in configure.ac
HDFFV-10219 another mode change
HDFFV-10219 change subset to use BINARY mode for h5dump
HDFFV-10219 default input binary to NATIVE
Set default of var to NATIVE
HDFFV-10219 - disable h5dump tests until h5import NATIVE is fixed
...
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r-- | CMakeLists.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ce91052..b84cc7c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -851,6 +851,11 @@ if (EXISTS "${HDF5_SOURCE_DIR}/fortran" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/for option (SKIP_HDF5_FORTRAN_SHARED "Do not build the fortran shared libraries" OFF) if (HDF5_BUILD_FORTRAN) if (BUILD_SHARED_LIBS AND APPLE) + # Tell cmake to do the right thing with COMMON symbols, this fixes + # corrupt values with COMMON and EQUIVALENCE when building shared + # Fortran libraries on OSX with gnu and Intel compilers (HDFFV-2772). + # *** NOTE: Fix does not work with Cmake. *** + # set (HDF5_LINKER_FLAGS "-Wl,-commons,use_dylibs") if (NOT ALLOW_UNSUPPORTED) message (STATUS " **** Shared FORTRAN libraries are unsupported **** ") set (SKIP_HDF5_FORTRAN_SHARED ON) |