diff options
author | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2023-10-10 14:18:00 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-10-10 14:18:00 (GMT) |
commit | 0ffde9da19c4cef79824fafba87e347f25f01606 (patch) | |
tree | f766c506b31c994dcff1b24ec52536535189e002 | |
parent | e4cea3509a09eda7bac73962e96e3eb96b310c49 (diff) | |
download | hdf5-0ffde9da19c4cef79824fafba87e347f25f01606.zip hdf5-0ffde9da19c4cef79824fafba87e347f25f01606.tar.gz hdf5-0ffde9da19c4cef79824fafba87e347f25f01606.tar.bz2 |
Fixes GH#1027 compilation error (#3654)
-rw-r--r-- | CMakeLists.txt | 6 | ||||
-rw-r--r-- | release_docs/RELEASE.txt | 9 |
2 files changed, 14 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c466487..6aa467d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -451,6 +451,12 @@ include (${HDF_RESOURCES_DIR}/ConfigureChecks.cmake) set (CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE ON) #----------------------------------------------------------------------------- +# Include directories in the source or build tree should come before other +# directories to prioritize headers in the sources over installed ones. +#----------------------------------------------------------------------------- +set(CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE ON) + +#----------------------------------------------------------------------------- # Mac OS X Options #----------------------------------------------------------------------------- if (HDF5_BUILD_FRAMEWORKS AND NOT BUILD_SHARED_LIBS) diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt index cba7948..2e17415 100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt @@ -682,7 +682,14 @@ Bug Fixes since HDF5-1.14.0 release Checks were added to the CMake and Autotools code to verify that CLOCK_MONOTONIC_COARSE, PTHREAD_MUTEX_ADAPTIVE_NP and pthread_condattr_setclock() are available before attempting to use them in Subfiling VFD-related utility code. Without these checks, attempting - to build the Subfiling VFD on macOS would fail. + to build the Subfiling VFD on macOS would fail. + + - Fixes the ordering of INCLUDES when building with CMake + + Include directories in the source or build tree should come before other + directories to prioritize headers in the sources over installed ones. + + Fixes GitHub #1027 - The accum test now passes on macOS 12+ (Monterey) w/ CMake |