ignore anaconda more effectively

Author: scivision

CMakeLists.txt

@@ -22,6 +22,10 @@ endif()
 
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 
+# --- avoid Anaconda libraries
+if(DEFINED ENV{CONDA_PREFIX})
+  list(APPEND CMAKE_IGNORE_PREFIX_PATH $ENV{CONDA_PREFIX})
+endif()
 
 include(options.cmake)
 include(cmake/compilers.cmake)

cmake/FindHDF5.cmake

@@ -63,6 +63,9 @@ include(CheckSymbolExists)
 include(CheckCSourceCompiles)
 include(CheckFortranSourceCompiles)
 
+# this is to help avoid unwanted Anaconda HDF5 or stray h5cc compiler script
+set(_use_sys_env_path ${CMAKE_FIND_USE_CMAKE_ENVIRONMENT_PATH})
+set(CMAKE_FIND_USE_SYSTEM_ENVIRONMENT_PATH false)
 function(get_flags exec outvar)
 
 execute_process(COMMAND ${exec} -show
@@ -501,13 +504,15 @@ if(HDF5_ROOT)
   NO_DEFAULT_PATH
   HINTS ${HDF5_ROOT}
   PATH_SUFFIXES ${hdf5_binsuf}
+  DOC "HDF5 Fortran compiler script"
   )
 else()
   find_program(HDF5_Fortran_COMPILER_EXECUTABLE
   NAMES ${wrapper_names}
   NAMES_PER_DIR
   PATHS ${hdf5_binpref}
   PATH_SUFFIXES ${hdf5_binsuf}
+  DOC "HDF5 Fortran compiler script"
   )
 endif()
 
@@ -556,13 +561,15 @@ if(HDF5_ROOT)
   NO_DEFAULT_PATH
   HINTS ${HDF5_ROOT}
   PATH_SUFFIXES ${hdf5_binsuf}
+  DOC "HDF5 C++ compiler script"
   )
 else()
   find_program(HDF5_CXX_COMPILER_EXECUTABLE
   NAMES ${wrapper_names}
   NAMES_PER_DIR
   PATHS ${hdf5_binpref}
   PATH_SUFFIXES ${hdf5_binsuf}
+  DOC "HDF5 C++ compiler script"
   )
 endif()
 
@@ -605,13 +612,15 @@ if(HDF5_ROOT)
   NO_DEFAULT_PATH
   HINTS ${HDF5_ROOT}
   PATH_SUFFIXES ${hdf5_binsuf}
+  DOC "HDF5 C compiler script"
   )
 else()
   find_program(HDF5_C_COMPILER_EXECUTABLE
   NAMES ${wrapper_names}
   NAMES_PER_DIR
   PATHS ${hdf5_binpref}
   PATH_SUFFIXES ${hdf5_binsuf}
+  DOC "HDF5 C compiler script"
   )
 endif()
 
@@ -779,14 +788,6 @@ if(NOT HDF5_ROOT)
   endif()
 endif()
 
-# Conda causes numerous problems with finding HDF5, so exclude from search
-if(DEFINED ENV{CONDA_PREFIX})
-  set(h5_ignore_path
-    $ENV{CONDA_PREFIX}/bin $ENV{CONDA_PREFIX}/lib $ENV{CONDA_PREFIX}/include
-    $ENV{CONDA_PREFIX}/Library/bin $ENV{CONDA_PREFIX}/Library/lib $ENV{CONDA_PREFIX}/Library/include
-  )
-  list(APPEND CMAKE_IGNORE_PATH ${h5_ignore_path})
-endif()
 
 # --- library suffixes
 
@@ -874,10 +875,7 @@ check_hdf5_link()
 set(CMAKE_REQUIRED_LIBRARIES)
 set(CMAKE_REQUIRED_INCLUDES)
 
-# pop off ignored paths so rest of script can find Python
-if(DEFINED CMAKE_IGNORE_PATH)
-  list(REMOVE_ITEM CMAKE_IGNORE_PATH "${h5_ignore_path}")
-endif()
+set(CMAKE_FIND_USE_SYSTEM_ENVIRONMENT_PATH ${_use_sys_env_path})
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(HDF5