diff options
| author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2021-02-09 15:45:18 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-09 15:45:18 (GMT) |
| commit | 679bc678cf139232499d90b84e4c575af7d42261 (patch) | |
| tree | 7f36b76ce2494cba6f044ef088c3a4f80d7a3ee2 /config/cmake | |
| parent | 62025dcac64243d50da295b5651c6ea94552299e (diff) | |
| download | hdf5-679bc678cf139232499d90b84e4c575af7d42261.zip hdf5-679bc678cf139232499d90b84e4c575af7d42261.tar.gz hdf5-679bc678cf139232499d90b84e4c575af7d42261.tar.bz2 | |
1 10 Merge #318 OSX changes from develop (#327)
* HDFFV-10865 - merge from dev, HDFArray perf fix.
* Remove duplicate setting
* Whitespace changes after clang format
* Undo version 11 clang format changes
* Merge CMake changes from develop
* test testing script merge from develop
* Update supported platforms
* PR#3 merge from develop
* Merge gcc 10 diagnostics option from develop
* Merge #318 OSX changes from develop
Diffstat (limited to 'config/cmake')
| -rw-r--r-- | config/cmake/H5pubconf.h.in | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/config/cmake/H5pubconf.h.in b/config/cmake/H5pubconf.h.in index 79566ff..5c2177a 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@ |