Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1 10 Merge #318 OSX changes from develop #327

Merged
merged 15 commits into from
Feb 9, 2021
Merged

1 10 Merge #318 OSX changes from develop #327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
ebe023d
HDFFV-10865 - merge from dev, HDFArray perf fix.
byrnHDF Dec 29, 2020
cc749db
Remove duplicate setting
byrnHDF Jan 4, 2021
5e6ecc2
Merge branch 'hdf5_1_10' of https://github.com/HDFGroup/hdf5.git into…
byrnHDF Jan 11, 2021
a9227df
Merge branch 'hdf5_1_10' of https://github.com/HDFGroup/hdf5.git into…
byrnHDF Jan 23, 2021
12c9d1a
Whitespace changes after clang format
byrnHDF Jan 27, 2021
55d3565
Undo version 11 clang format changes
byrnHDF Jan 28, 2021
ee4ebd3
Merge branch 'hdf5_1_10' of https://github.com/HDFGroup/hdf5.git into…
byrnHDF Feb 1, 2021
51e5378
Merge CMake changes from develop
byrnHDF Feb 1, 2021
bbc9609
test testing script merge from develop
byrnHDF Feb 1, 2021
a8ae83d
Update supported platforms
byrnHDF Feb 2, 2021
02f185b
Merge branch 'hdf5_1_10' of https://github.com/HDFGroup/hdf5.git into…
byrnHDF Feb 4, 2021
39d6885
PR#3 merge from develop
byrnHDF Feb 4, 2021
28e5eb4
Merge gcc 10 diagnostics option from develop
byrnHDF Feb 8, 2021
678653c
Merge branch 'hdf5_1_10' of https://github.com/HDFGroup/hdf5.git into…
byrnHDF Feb 9, 2021
55368fa
Merge #318 OSX changes from develop
byrnHDF Feb 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions config/cmake/H5pubconf.h.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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@

Expand Down
15 changes: 0 additions & 15 deletions config/cmake_ext_mod/ConfigureChecks.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
7 changes: 7 additions & 0 deletions release_docs/RELEASE.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,13 @@ New Features

Configuration:
-------------
- On macOS, Universal Binaries can now be built, allowing native execution on
both Intel and Apple Silicon (ARM) based Macs.

To do so, set CMAKE_OSX_ARCHITECTURES="x86_64;arm64"

(SAM - 2021/02/07, https://github.com/HDFGroup/hdf5/issues/311)

- Added a configure-time option to control certain compiler warnings
diagnostics

Expand Down