summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorSean <sean@rogue-research.com>2021-02-08 20:16:41 (GMT)
committerGitHub <noreply@github.com>2021-02-08 20:16:41 (GMT)
commitaa95b70f6da1852f136e36954814be0fa4b02fa2 (patch)
tree4c8ef030d8a8679b229cd879f9b2a85a8798d89e /config
parent2b4b8e8423bcbbc25df3c5d262bf310703e78f1b (diff)
downloadhdf5-aa95b70f6da1852f136e36954814be0fa4b02fa2.zip
hdf5-aa95b70f6da1852f136e36954814be0fa4b02fa2.tar.gz
hdf5-aa95b70f6da1852f136e36954814be0fa4b02fa2.tar.bz2
Remove prohibition against building Universal Binaries on macOS (#318)
Fixes github issue #311.
Diffstat (limited to 'config')
-rw-r--r--config/cmake/H5pubconf.h.in3
-rw-r--r--config/cmake_ext_mod/ConfigureChecks.cmake15
2 files changed, 0 insertions, 18 deletions
diff --git a/config/cmake/H5pubconf.h.in b/config/cmake/H5pubconf.h.in
index a4d07fc..1256cf8 100644
--- a/config/cmake/H5pubconf.h.in
+++ b/config/cmake/H5pubconf.h.in
@@ -26,9 +26,6 @@
/* Define if using a Windows compiler (i.e. Visual Studio) */
#cmakedefine H5_HAVE_VISUAL_STUDIO @H5_HAVE_VISUAL_STUDIO@
-/* Define if building universal (internal helper macro) */
-#cmakedefine H5_AC_APPLE_UNIVERSAL_BUILD @H5_AC_APPLE_UNIVERSAL_BUILD@
-
/* Define if C++ compiler recognizes offsetof */
#cmakedefine H5_CXX_HAVE_OFFSETOF @CXX_HAVE_OFFSETOF@
diff --git a/config/cmake_ext_mod/ConfigureChecks.cmake b/config/cmake_ext_mod/ConfigureChecks.cmake
index 5fa6ca1..3722a0c 100644
--- a/config/cmake_ext_mod/ConfigureChecks.cmake
+++ b/config/cmake_ext_mod/ConfigureChecks.cmake
@@ -22,21 +22,6 @@ include (CheckVariableExists)
include (TestBigEndian)
include (CheckStructHasMember)
-#-----------------------------------------------------------------------------
-# APPLE/Darwin setup
-#-----------------------------------------------------------------------------
-if (APPLE)
- 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 (${HDF_PREFIX}_AC_APPLE_UNIVERSAL_BUILD 0)
-endif ()
-
# Check for Darwin (not just Apple - we also want to catch OpenDarwin)
if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
set (${HDF_PREFIX}_HAVE_DARWIN 1)