hdf5 cmake sanity check, add check for resolved dir as well (#656)

* hdf5 cmake sanity check, add check for resolved dir as well * update changelog
LLNL · Nov 20, 2020 · 8a70c6c · 8a70c6c
1 parent ce42b43
commit 8a70c6c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,7 @@ and this project aspires to adhere to [Semantic Versioning](https://semver.org/s
 - Conduit now requires C++11 support.
 
 ### Added
+- CMake: Added extra check for include dir vs fully resolved hdf5 path.
 
 #### General 
 - Added a builtin sandboxed header-only version of fmt. The namespace and directory paths were changed to `conduit_fmt` to avoid potential symbol collisions with other codes using fmt. Downstream software can use by including `conduit_fmt/conduit_fmt.h`.

diff --git a/src/cmake/thirdparty/SetupHDF5.cmake b/src/cmake/thirdparty/SetupHDF5.cmake
@@ -77,6 +77,12 @@ foreach(IDIR ${HDF5_INCLUDE_DIRS})
         message(STATUS " ${IDIR_REAL} includes HDF5_DIR (${HDF5_DIR})")
         set(check_hdf5_inc_dir_ok 1)
     endif()
+
+    if("${IDIR_REAL}" MATCHES "${HDF5_REAL_DIR}")
+        message(STATUS " ${IDIR_REAL} includes HDF5_REAL_DIR (${HDF5_REAL_DIR})")
+        set(check_hdf5_inc_dir_ok 1)
+    endif()
+
 endforeach()
 
 if(NOT check_hdf5_inc_dir_ok)