FindHDF5 ignores conda

Author: scivision

CMakePresets.json

@@ -15,13 +15,6 @@
   "displayName": "Ninja Multi-Config",
   "generator": "Ninja Multi-Config"
 },
-{
-  "name": "notest", "inherits": "default",
-  "displayName": "omit self-tests",
-  "cacheVariables": {
-    "BUILD_TESTING": false
-  }
-},
 {
   "name": "build", "inherits": "default",
   "displayName": "build all libraries",

README.md

@@ -83,6 +83,12 @@ for more details see [Install.md](./Install.md).
 
 For general use with non-CMake build systems, "h5fortran.pc" pkg-config file is also generated / installed.
 
+To save time, if not intended to use self-tests, you can skip the build of the test suite:
+
+```sh
+cmake -B build -DBUILD_TESTING=off
+```
+
 ### Autobuild HDF5
 
 h5fortran will automatically build the HDF5 and ZLIB libraries if needed.

VERSION

@@ -1 +1 @@
-4.2.3
+4.2.4

cmake/Modules/FindHDF5.cmake

@@ -350,7 +350,8 @@ endif()
 
 find_program(HDF5_Fortran_COMPILER_EXECUTABLE
   NAMES ${wrapper_names}
-  HINTS ENV HOMEBREW_PREFIX
+  NAMES_PER_DIR
+  HINTS ${HOMEBREW_PREFIX} ENV HOMEBREW_PREFIX ${MACPORTS_PREFIX} ENV MACPORTS_PREFIX
   PATHS ${hdf5_binpref}
   PATH_SUFFIXES ${hdf5_binsuf}
 )
@@ -387,7 +388,8 @@ set(inc_dirs)
 
 find_program(HDF5_CXX_COMPILER_EXECUTABLE
   NAMES h5c++ h5c++-64
-  HINTS ENV HOMEBREW_PREFIX
+  NAMES_PER_DIR
+  HINTS ${HOMEBREW_PREFIX} ENV HOMEBREW_PREFIX ${MACPORTS_PREFIX} ENV MACPORTS_PREFIX
   PATHS ${hdf5_binpref}
   PATH_SUFFIXES ${hdf5_binsuf}
 )
@@ -423,7 +425,8 @@ endif()
 
 find_program(HDF5_C_COMPILER_EXECUTABLE
   NAMES ${wrapper_names}
-  HINTS ENV HOMEBREW_PREFIX
+  NAMES_PER_DIR
+  HINTS ${HOMEBREW_PREFIX} ENV HOMEBREW_PREFIX ${MACPORTS_PREFIX} ENV MACPORTS_PREFIX
   PATHS ${hdf5_binpref}
   PATH_SUFFIXES ${hdf5_binsuf}
 )
@@ -571,6 +574,11 @@ if(NOT HDF5_ROOT AND DEFINED ENV{HDF5_ROOT})
   set(HDF5_ROOT $ENV{HDF5_ROOT})
 endif()
 
+# Conda causes numerous problems with finding HDF5, so exclude from search
+if(DEFINED ENV{CONDA_PREFIX})
+  list(APPEND CMAKE_IGNORE_PATH $ENV{CONDA_PREFIX}/bin $ENV{CONDA_PREFIX}/lib $ENV{CONDA_PREFIX}/include)
+endif()
+
 # we don't use pkg-config names because some distros pkg-config for HDF5 is broken
 # however at least the paths are often correct
 find_package(PkgConfig)
@@ -634,6 +642,11 @@ check_hdf5_link()
 set(CMAKE_REQUIRED_LIBRARIES)
 set(CMAKE_REQUIRED_INCLUDES)
 
+# pop off ignored paths so rest of script can find Python
+list(POP_BACK CMAKE_IGNORE_PATH)
+list(POP_BACK CMAKE_IGNORE_PATH)
+list(POP_BACK CMAKE_IGNORE_PATH)
+
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(HDF5
   REQUIRED_VARS HDF5_C_LIBRARIES HDF5_links