From a630ede6d53c0a2b41bf8a97ac49a512eddfe623 Mon Sep 17 00:00:00 2001 From: Scot Breitenfeld Date: Mon, 9 Oct 2023 14:39:56 -0500 Subject: [PATCH 1/2] fixes GH#1027 compilation error --- CMakeLists.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index c466487b70f..6aa467d110b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -450,6 +450,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 #----------------------------------------------------------------------------- From f43e69f47dbf273aa1902d081d7fe2bc8d623e19 Mon Sep 17 00:00:00 2001 From: Scot Breitenfeld Date: Mon, 9 Oct 2023 16:55:33 -0500 Subject: [PATCH 2/2] added release note --- release_docs/RELEASE.txt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt index cba7948c3fa..2e17415f055 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