diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2013-01-08 01:19:17 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2013-01-08 01:19:17 (GMT) |
| commit | 724a0a93b4c6d00a47431d4c33fbedc4e402c2c4 (patch) | |
| tree | 2a5e8962d028f9c3269bde09652da38110a99fa5 /config | |
| parent | 38517de982be2c3abc2abc53e5096f5ef57c5ab5 (diff) | |
| download | hdf5-724a0a93b4c6d00a47431d4c33fbedc4e402c2c4.zip hdf5-724a0a93b4c6d00a47431d4c33fbedc4e402c2c4.tar.gz hdf5-724a0a93b4c6d00a47431d4c33fbedc4e402c2c4.tar.bz2 | |
[svn-r23142] Purpose:
Merged 23111 from the trunk.
(Core VFD and Mac OS X I/O changes)
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')
| -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 84ee5b3..4fcff2d 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 d0a182b..5c7f3b2 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@ |