better HDF5 for Intel windows

Author: scivision

CMakeLists.txt

@@ -21,13 +21,13 @@ include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/hdf5.cmake)
 
 if(NOT HDF5OK)
   message(STATUS "h5fortran: HDF5 not working")
-  if(NOT PROJECT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
+  if(PROJECT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
+    message(FATAL_ERROR)
+  else()
     return()
   endif()
 endif()
 
-set(CTEST_TEST_TIMEOUT 15)
-
 # --- build
 
 add_library(h5fortran)

cmake/hdf5.cmake

@@ -54,6 +54,17 @@ if(UNIX)
   list(APPEND HDF5_LIBRARIES m)
 endif()
 
+if(WIN32 AND MSVC)
+  # this stanza must be BEFORE if(DEFINED HDF5OK)
+  if(NOT DEFINED HDF5_ROOT AND DEFINED ENV{HDF5_ROOT})
+    file(TO_CMAKE_PATH "$ENV{HDF5_ROOT}" HDF5_ROOT)
+  endif()
+
+  if(DEFINED HDF5_ROOT)
+    set(ENV{PATH} "${HDF5_ROOT}/bin;$ENV{PATH}")
+  endif()
+endif()
+
 if(DEFINED HDF5OK)
   return()
 endif()

src/tests/CMakeLists.txt

@@ -50,16 +50,12 @@ set_tests_properties(h5fortran:ShapeCheck PROPERTIES
   SKIP_RETURN_CODE 77)
 
 if(WIN32 AND MSVC)
-  if(NOT DEFINED HDF5_ROOT AND DEFINED ENV{HDF5_ROOT})
-    file(TO_CMAKE_PATH "$ENV{HDF5_ROOT}" HDF5_ROOT)
-  endif()
-
   foreach(t h5fortran:minimal h5fortran:ErrorCheck h5fortran:test_exist h5fortran:module h5fortran:deflate h5fortran:ShapeCheck)
     set_tests_properties(${t} PROPERTIES ENVIRONMENT "PATH=${HDF5_ROOT}/bin;$ENV{PATH}")
   endforeach()
 endif()
 
-# ---
+# --- shaky tests
 if(NOT test_shaky)
   return()
 endif()