[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)
This commit is contained in:
@@ -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
|
||||
#-----------------------------------------------------------------------------
|
||||
|
||||
Reference in New Issue
Block a user