FindHDF5: don't block path in here:

Author: scivision

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.14...3.27)
+cmake_minimum_required(VERSION 3.14...3.28)
 
 if(CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR)
   message(FATAL_ERROR "Please do out of source build like
@@ -25,6 +25,10 @@ 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})
+  list(APPEND CMAKE_IGNORE_PATH $ENV{CONDA_PREFIX}/bin)
+  # need CMAKE_IGNORE_PATH for CMake < 3.23
+  # and to ensure system env var PATH doesn't interfere
+  # despite CMAKE_IGNORE_PREFIX_PATH
 endif()
 
 include(options.cmake)

cmake/FindHDF5.cmake

@@ -63,9 +63,7 @@ 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
@@ -875,8 +873,6 @@ check_hdf5_link()
 set(CMAKE_REQUIRED_LIBRARIES)
 set(CMAKE_REQUIRED_INCLUDES)
 
-set(CMAKE_FIND_USE_SYSTEM_ENVIRONMENT_PATH ${_use_sys_env_path})
-
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(HDF5
 REQUIRED_VARS HDF5_C_LIBRARIES HDF5_links

test/CMakeLists.txt

@@ -90,12 +90,11 @@ if(WIN32 AND CMAKE_VERSION VERSION_GREATER_EQUAL 3.22)
 endif()
 
 # --- Python h5py
-if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.12)
-  set(Python_FIND_VIRTUALENV STANDARD)
-  # use order in PATH to pick Python interpreter
-  # this avoids unexpected old system Python getting used IF conda environment has been activated
-  find_package(Python COMPONENTS Interpreter)
-endif()
+set(Python_FIND_VIRTUALENV STANDARD)
+# use order in PATH to pick Python interpreter
+# this avoids unexpected old system Python getting used IF conda environment has been activated
+find_package(Python COMPONENTS Interpreter)
+
 if(NOT DEFINED h5py_ok)
   execute_process(COMMAND ${Python_EXECUTABLE} -c "import h5py"
   RESULT_VARIABLE ret