From c8db4a806581993af6b5ca79847d85b36501179b Mon Sep 17 00:00:00 2001 From: Ben Spencer Date: Thu, 14 Oct 2021 12:51:22 -0600 Subject: [PATCH] Update neml submodule and account for change in neml build ref #66 --- contrib/neml | 2 +- contrib/neml.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/neml b/contrib/neml index bacd95db..afdb6bd9 160000 --- a/contrib/neml +++ b/contrib/neml @@ -1 +1 @@ -Subproject commit bacd95db85e127707ffe7030e24cd4ff760c018b +Subproject commit afdb6bd91e713e8cadbfb1f5d2812e499b1d96df diff --git a/contrib/neml.mk b/contrib/neml.mk index 5e240c22..a165b8f5 100644 --- a/contrib/neml.mk +++ b/contrib/neml.mk @@ -7,7 +7,7 @@ ifneq ($(wildcard $(NEML_DIR)/CMakeLists.txt),) neml_srcfiles := $(shell find $(NEML_DIR)/src -name "*.cxx" | grep -v _wrap) neml_objects += $(patsubst %.cxx,%.$(obj-suffix),$(neml_srcfiles)) neml_LIB := $(NEML_DIR)/libneml-$(METHOD).la -neml_includes := $(NEML_DIR)/src +neml_includes := $(NEML_DIR)/include neml_dep_includes := -iquote$(NEML_DIR)/rapidxml -iquote$(BLACKBEAR_DIR)/contrib/neml_extra_include $(APPLICATION_DIR)/lib/libblackbear-$(METHOD).la: $(neml_LIB)