diff --git a/packages/mfem/mfem_conduit_spack.patch b/packages/mfem/mfem_conduit_spack.patch new file mode 100644 index 0000000..0913207 --- /dev/null +++ b/packages/mfem/mfem_conduit_spack.patch @@ -0,0 +1,37 @@ +diff --git a/config/defaults.mk b/config/defaults.mk +index d6b8d59a1..d1ba6fb9a 100644 +--- a/config/defaults.mk ++++ b/config/defaults.mk +@@ -452,7 +452,7 @@ FMS_LIB = -Wl,-rpath,$(FMS_DIR)/lib -L$(FMS_DIR)/lib -lfms + + # Conduit and required libraries configuration + CONDUIT_DIR = @MFEM_DIR@/../conduit +-CONDUIT_OPT = -I$(CONDUIT_DIR)/include/conduit ++CONDUIT_OPT = -I$(CONDUIT_DIR)/include + CONDUIT_LIB = \ + $(XLINKER)-rpath,$(CONDUIT_DIR)/lib -L$(CONDUIT_DIR)/lib \ + -lconduit -lconduit_relay -lconduit_blueprint -ldl +@@ -469,8 +469,8 @@ endif + # Sidre and required libraries configuration + # Be sure to check the HDF5_DIR (set above) is correct + SIDRE_DIR = @MFEM_DIR@/../axom +-SIDRE_OPT = -I$(SIDRE_DIR)/include -I$(CONDUIT_DIR)/include/conduit\ +- -I$(HDF5_DIR)/include ++SIDRE_OPT = -I$(SIDRE_DIR)/include -I$(CONDUIT_DIR)/include/conduit \ ++ -I$(CONDUIT_DIR)/include -I$(HDF5_DIR)/include + SIDRE_LIB = \ + $(XLINKER)-rpath,$(SIDRE_DIR)/lib -L$(SIDRE_DIR)/lib \ + $(XLINKER)-rpath,$(CONDUIT_DIR)/lib -L$(CONDUIT_DIR)/lib \ +diff --git a/fem/conduitdatacollection.hpp b/fem/conduitdatacollection.hpp +index 6ff1804e0..ad0a272a4 100644 +--- a/fem/conduitdatacollection.hpp ++++ b/fem/conduitdatacollection.hpp +@@ -17,7 +17,7 @@ + #ifdef MFEM_USE_CONDUIT + + #include "datacollection.hpp" +-#include ++#include + + namespace mfem + { diff --git a/packages/mfem/pachage.py b/packages/mfem/pachage.py new file mode 100644 index 0000000..0047746 --- /dev/null +++ b/packages/mfem/pachage.py @@ -0,0 +1,13 @@ +# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) + + +from spack.package import * +from spack.pkg.builtin.mfem import Mfem as SpackMfem + + +class Mfem(SpackMfem): + + patch(mfem_conduit_spack.patch)