diff --git a/platypus.mk b/platypus.mk index a20aad62..1a9ed643 100644 --- a/platypus.mk +++ b/platypus.mk @@ -1,11 +1,9 @@ -MFEM_DIR :=$(APPLICATION_DIR)/../mfem/build +MFEM_DIR ?= $(APPLICATION_DIR)/../mfem/installed -include $(MFEM_DIR)/config/config.mk -MFEM_INCLUDES := -I$(MFEM_INC_DIR)/config -I$(MFEM_DIR)/ -I$(MFEM_DIR)/../miniapps/common $(MFEM_INCFLAGS) -MFEM_LIBS := -L$(MFEM_DIR) -lmfem -lrt -L$(MFEM_DIR)/miniapps/common -lmfem-common $(MFEM_LIB) +include $(MFEM_DIR)/share/mfem/config.mk -ADDITIONAL_INCLUDES += $(MFEM_INCLUDES) -ADDITIONAL_LIBS += -Wl, $(MFEM_LIBS) ${MFEM_EXT_LIBS} +ADDITIONAL_INCLUDES += $(MFEM_INCFLAGS) +ADDITIONAL_LIBS += $(MFEM_LIBS) -lmfem-common $(info ADDITIONAL_INCLUDES = $(ADDITIONAL_INCLUDES)); -$(info ADDITIONAL_LIBS = $(ADDITIONAL_LIBS)); \ No newline at end of file +$(info ADDITIONAL_LIBS = $(ADDITIONAL_LIBS)); diff --git a/unit/src/MFEMEssentialBCTest.C b/unit/src/MFEMEssentialBCTest.C index 43934cd3..ab171474 100644 --- a/unit/src/MFEMEssentialBCTest.C +++ b/unit/src/MFEMEssentialBCTest.C @@ -1,4 +1,4 @@ -#include "mfem-common.hpp" +#include "mfem/miniapps/common/mfem-common.hpp" #include "MFEMObjectUnitTest.h" #include "MFEMScalarDirichletBC.h" #include "MFEMScalarFunctionDirichletBC.h"