diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2010-08-31 20:15:13 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2010-08-31 20:15:13 (GMT) |
| commit | e65aa8c36566febd00da128e64cc90f3c8ffbc70 (patch) | |
| tree | 1c52c1ccdf6b28b73702da3b49bad78f5414b33c /config/cmake/ConfigureChecks.cmake | |
| parent | b8d1216dcac1b773f9a7f757ee4dca67547dc082 (diff) | |
| download | hdf5-e65aa8c36566febd00da128e64cc90f3c8ffbc70.zip hdf5-e65aa8c36566febd00da128e64cc90f3c8ffbc70.tar.gz hdf5-e65aa8c36566febd00da128e64cc90f3c8ffbc70.tar.bz2 | |
[svn-r19325] Added parallel build commands.
Corrected use/name of source folder aliases.
Duplicated FindMPI.cmake so that non-c++ compiler is found first (recommemded commands did not work).
Tested: local linux with mpich
Diffstat (limited to 'config/cmake/ConfigureChecks.cmake')
| -rw-r--r-- | config/cmake/ConfigureChecks.cmake | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/config/cmake/ConfigureChecks.cmake b/config/cmake/ConfigureChecks.cmake index 8b3e9be..3a16856 100644 --- a/config/cmake/ConfigureChecks.cmake +++ b/config/cmake/ConfigureChecks.cmake @@ -17,7 +17,15 @@ MESSAGE (STATUS " GetConsoleScreenBufferInfo function for Windows") # Always SET this for now IF we are on an OS X box #----------------------------------------------------------------------------- IF (APPLE) - SET (H5_AC_APPLE_UNIVERSAL_BUILD 1) + LIST(LENGTH CMAKE_OSX_ARCHITECTURES ARCH_LENGTH) + IF(ARCH_LENGTH GREATER 1) + set (CMAKE_OSX_ARCHITECTURES "" CACHE STRING "" FORCE) + message(FATAL_ERROR "Building Universal Binaries on OS X is NOT supported by the HDF5 project. This is" + "due to technical reasons. The best approach would be build each architecture in separate directories" + "and use the 'lipo' tool to combine them into a single executable or library. The 'CMAKE_OSX_ARCHITECTURES'" + "variable has been set to a blank value which will build the default architecture for this system.") + ENDIF() + SET (H5_AC_APPLE_UNIVERSAL_BUILD 0) ENDIF (APPLE) #----------------------------------------------------------------------------- |