1 files changed, 121 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/hdf5/1.8.22_cmake.patch b/var/spack/repos/builtin/packages/hdf5/1.8.22_cmake.patch
new file mode 100644
index 0000000000..b6016fd5b0
--- /dev/null
+++ b/var/spack/repos/builtin/packages/hdf5/1.8.22_cmake.patch
@@ -0,0 +1,121 @@
+diff --git a/c++/src/CMakeLists.txt b/c++/src/CMakeLists.txt
+index 65d1d43..9e4bf24 100644
+--- a/c++/src/CMakeLists.txt
++++ b/c++/src/CMakeLists.txt
+@@ -211,7 +211,11 @@ install (
+ )
+ 
+ if (NOT WIN32 AND NOT MINGW)
+-  set (_PKG_CONFIG_COMPILER ${CMAKE_CXX_COMPILER})
++  if (HDF5_ENABLE_PARALLEL AND MPI_CXX_FOUND)
++    set (_PKG_CONFIG_COMPILER ${MPI_CXX_COMPILER})
++  else ()
++    set (_PKG_CONFIG_COMPILER ${CMAKE_CXX_COMPILER})
++  endif ()
+   configure_file (
+       ${HDF_RESOURCES_DIR}/libh5cc.in
+       ${HDF5_BINARY_DIR}/CMakeFiles/h5c++
+diff --git a/fortran/src/CMakeLists.txt b/fortran/src/CMakeLists.txt
+index dd03439..f58dde9 100644
+--- a/fortran/src/CMakeLists.txt
++++ b/fortran/src/CMakeLists.txt
+@@ -595,7 +595,11 @@ install (
+ )
+ 
+ if (NOT WIN32 AND NOT MINGW)
+-  set (_PKG_CONFIG_COMPILER ${CMAKE_Fortran_COMPILER})
++  if (HDF5_ENABLE_PARALLEL AND MPI_Fortran_FOUND)
++    set (_PKG_CONFIG_COMPILER ${MPI_Fortran_COMPILER})
++  else ()
++    set (_PKG_CONFIG_COMPILER ${CMAKE_Fortran_COMPILER})
++  endif ()
+   configure_file (
+       ${HDF_RESOURCES_DIR}/libh5cc.in
+       ${HDF5_BINARY_DIR}/CMakeFiles/h5fc
+diff --git a/hl/c++/src/CMakeLists.txt b/hl/c++/src/CMakeLists.txt
+index 1eac9fe..e488656 100644
+--- a/hl/c++/src/CMakeLists.txt
++++ b/hl/c++/src/CMakeLists.txt
+@@ -120,7 +120,11 @@ install (
+ )
+ 
+ if (NOT WIN32 AND NOT MINGW)
+-  set (_PKG_CONFIG_COMPILER ${CMAKE_CXX_COMPILER})
++  if (HDF5_ENABLE_PARALLEL AND MPI_CXX_FOUND)
++    set (_PKG_CONFIG_COMPILER ${MPI_CXX_COMPILER})
++  else ()
++    set (_PKG_CONFIG_COMPILER ${CMAKE_CXX_COMPILER})
++  endif ()
+   configure_file (
+       ${HDF_RESOURCES_DIR}/libh5cc.in
+       ${HDF5_BINARY_DIR}/CMakeFiles/h5hlc++
+diff --git a/hl/fortran/src/CMakeLists.txt b/hl/fortran/src/CMakeLists.txt
+index b309e92..c889736 100644
+--- a/hl/fortran/src/CMakeLists.txt
++++ b/hl/fortran/src/CMakeLists.txt
+@@ -260,7 +260,11 @@ install (
+ )
+ 
+ if (NOT WIN32 AND NOT MINGW)
+-  set (_PKG_CONFIG_COMPILER ${CMAKE_Fortran_COMPILER})
++  if (HDF5_ENABLE_PARALLEL AND MPI_Fortran_FOUND)
++    set (_PKG_CONFIG_COMPILER ${MPI_Fortran_COMPILER})
++  else ()
++    set (_PKG_CONFIG_COMPILER ${CMAKE_Fortran_COMPILER})
++  endif ()
+   configure_file (
+       ${HDF_RESOURCES_DIR}/libh5cc.in
+       ${HDF5_BINARY_DIR}/CMakeFiles/h5hlfc
+diff --git a/hl/src/CMakeLists.txt b/hl/src/CMakeLists.txt
+index cc5aca5..d07f354 100644
+--- a/hl/src/CMakeLists.txt
++++ b/hl/src/CMakeLists.txt
+@@ -148,7 +148,11 @@ install (
+ )
+ 
+ if (NOT WIN32 AND NOT MINGW)
+-  set (_PKG_CONFIG_COMPILER ${CMAKE_C_COMPILER})
++  if (HDF5_ENABLE_PARALLEL AND MPI_C_FOUND)
++    set (_PKG_CONFIG_COMPILER ${MPI_C_COMPILER})
++  else ()
++    set (_PKG_CONFIG_COMPILER ${CMAKE_C_COMPILER})
++  endif ()
+   configure_file (
+       ${HDF_RESOURCES_DIR}/libh5cc.in
+       ${HDF5_BINARY_DIR}/CMakeFiles/h5hlcc
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 217c55d..521d3fd 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -1129,7 +1129,11 @@ install (
+ )
+ 
+ if (NOT WIN32)
+-  set (_PKG_CONFIG_COMPILER ${CMAKE_C_COMPILER})
++  if (HDF5_ENABLE_PARALLEL AND MPI_C_FOUND)
++    set (_PKG_CONFIG_COMPILER ${MPI_C_COMPILER})
++  else ()
++    set (_PKG_CONFIG_COMPILER ${CMAKE_C_COMPILER})
++  endif ()
+   configure_file (
+       ${HDF_RESOURCES_DIR}/libh5cc.in
+       ${HDF5_BINARY_DIR}/CMakeFiles/h5cc
+@@ -1141,4 +1145,18 @@ if (NOT WIN32)
+       PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
+       COMPONENT libraries
+   )
++  if (HDF5_ENABLE_PARALLEL AND MPI_C_FOUND)
++    #legacy requires a different name
++    configure_file (
++        ${HDF_RESOURCES_DIR}/libh5cc.in
++        ${HDF5_BINARY_DIR}/CMakeFiles/h5pcc
++        @ONLY
++    )
++    install (
++        FILES ${HDF5_BINARY_DIR}/CMakeFiles/h5pcc
++        DESTINATION ${HDF5_INSTALL_BIN_DIR}
++        PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
++        COMPONENT libraries
++    )
++  endif ()
+ endif ()