diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2012-12-19 21:51:55 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2012-12-19 21:51:55 (GMT) |
| commit | 7b5b6d239e5f7a9f5317bc1df521468823db53f8 (patch) | |
| tree | 11a5030f6e12dff457e56e95d7ee07ac2625a37f /config/cmake | |
| parent | a50b051538a76ccfcf427b5fbf9b95e1ba8e81e4 (diff) | |
| download | hdf5-7b5b6d239e5f7a9f5317bc1df521468823db53f8.zip hdf5-7b5b6d239e5f7a9f5317bc1df521468823db53f8.tar.gz hdf5-7b5b6d239e5f7a9f5317bc1df521468823db53f8.tar.bz2 | |
[svn-r23111] Purpose:
Fixes for HDF5 1.8.10 p1
HDFFV-7975
Changed the max single I/O operation size on Darwin/Mac OS X.
HDFFV-8124 and HDFFV-8158
Fixed a core VFD bug when large blocks of data are read.
HDFFV-8246
Added more fields to the VFD read/write error messages.
Tested on:
64-bit Windows 7, Visual Studio 2010, CMake
64-bit Mac OS X Snow Leopard (Fred), Fortran, C++
64-bit BE Linux (Ostrich), Fortran, C++
32-bit LE Linux (jam), Fortran, C++ (also parallel w/ Fortran)
Diffstat (limited to 'config/cmake')
| -rw-r--r-- | config/cmake/ConfigureChecks.cmake | 7 | ||||
| -rw-r--r-- | config/cmake/H5pubconf.h.in | 3 |
2 files changed, 9 insertions, 1 deletions
diff --git a/config/cmake/ConfigureChecks.cmake b/config/cmake/ConfigureChecks.cmake index 4f4f759..6db6d78 100644 --- a/config/cmake/ConfigureChecks.cmake +++ b/config/cmake/ConfigureChecks.cmake @@ -14,7 +14,7 @@ INCLUDE (${CMAKE_ROOT}/Modules/TestBigEndian.cmake) INCLUDE (${CMAKE_ROOT}/Modules/TestForSTDNamespace.cmake) #----------------------------------------------------------------------------- -# Always SET this for now IF we are on an OS X box +# APPLE/Darwin setup #----------------------------------------------------------------------------- IF (APPLE) LIST(LENGTH CMAKE_OSX_ARCHITECTURES ARCH_LENGTH) @@ -28,6 +28,11 @@ IF (APPLE) SET (H5_AC_APPLE_UNIVERSAL_BUILD 0) ENDIF (APPLE) +# Check for Darwin (not just Apple - we also want to catch OpenDarwin) +IF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + SET (H5_HAVE_DARWIN 1) +ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + #----------------------------------------------------------------------------- # Option to Clear File Buffers before write --enable-clear-file-buffers #----------------------------------------------------------------------------- diff --git a/config/cmake/H5pubconf.h.in b/config/cmake/H5pubconf.h.in index 6fca1ae..d9f0997 100644 --- a/config/cmake/H5pubconf.h.in +++ b/config/cmake/H5pubconf.h.in @@ -111,6 +111,9 @@ /* Define if the function stack tracing code is to be compiled in */ #cmakedefine H5_HAVE_CODESTACK @H5_HAVE_CODESTACK@ +/* Define if Darwin or Mac OS X */ +#cmakedefine H5_HAVE_DARWIN @H5_HAVE_DARWIN@ + /* Define to 1 if you have the declaration of `tzname', and to 0 if you don't. */ #cmakedefine H5_HAVE_DECL_TZNAME @H5_HAVE_DECL_TZNAME@ |