1 files changed, 0 insertions, 104 deletions
diff --git a/var/spack/repos/builtin/packages/hdf5/1.12.0_cmake.patch b/var/spack/repos/builtin/packages/hdf5/1.12.0_cmake.patch
deleted file mode 100644
index 68e56e96e7..0000000000
--- a/var/spack/repos/builtin/packages/hdf5/1.12.0_cmake.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-diff --git a/c++/src/CMakeLists.txt b/c++/src/CMakeLists.txt
-index 39f0f3a..9dc69d6 100644
---- a/c++/src/CMakeLists.txt
-+++ b/c++/src/CMakeLists.txt
-@@ -196,7 +196,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 b5d1a60..22ed7fb 100644
---- a/fortran/src/CMakeLists.txt
-+++ b/fortran/src/CMakeLists.txt
-@@ -533,7 +533,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 866f372..6abd376 100644
---- a/hl/c++/src/CMakeLists.txt
-+++ b/hl/c++/src/CMakeLists.txt
-@@ -109,7 +109,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/src/CMakeLists.txt b/hl/src/CMakeLists.txt
-index 55d84c7..857a390 100644
---- a/hl/src/CMakeLists.txt
-+++ b/hl/src/CMakeLists.txt
-@@ -133,7 +133,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 f582056..d7ddee4 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -1272,7 +1272,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
-@@ -1284,4 +1288,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 ()