Merge pull request #1939 from CEED/jeremy/dealii-build

dealii CI Error

Author: jeremylt

.gitignore

@@ -54,6 +54,9 @@ doc/sphinx/source/examples/
 # Clang GPU temp files
 temp/*
 
+# Nek5K
+SESSION.NAME
+
 # Output files, videos, and compressed archives should not be added accidentally
 *.avi
 *.bin

Makefile

@@ -702,10 +702,13 @@ $(OBJDIR)/%$(EXE_SUFFIX) : examples/ceed/%.f90 | $$(@D)/.DIR
 
 # deal.II
 # Note: Invoking deal.II's CMAKE build system here
-$(OBJDIR)/dealii-% : examples/deal.II/*.cc examples/deal.II/*.h $(libceed) | $$(@D)/.DIR
+.NOPARALLEL: dealii
+dealii :
 	mkdir -p examples/deal.II/build
 	cmake -B examples/deal.II/build -S examples/deal.II -DDEAL_II_DIR=$(DEAL_II_DIR) -DCEED_DIR=$(PWD)
 	+$(call quiet,MAKE) -C examples/deal.II/build
+
+$(OBJDIR)/dealii-% : examples/deal.II/*.cc examples/deal.II/*.h $(libceed) dealii | $$(@D)/.DIR
 	cp examples/deal.II/build/$* $@
 
 # MFEM

examples/Makefile

@@ -36,6 +36,9 @@ all: ceed mfem nek petsc fluids solids
 ceed:
 	make CEED_DIR=$(CEED_DIR) -C ceed all
 
+dealii:
+	$(RM) -rf deal.II/build
+
 mfem:
 	make CEED_DIR=$(CEED_DIR) MFEM_DIR=$(MFEM_DIR) -C mfem all
 
@@ -54,7 +57,7 @@ fluids:
 solids:
 	make CEED_DIR=$(CEED_DIR) PETSC_DIR=$(PETSC_DIR) PETSC_ARCH=$(PETSC_ARCH) -C solids all
 
-clean:
+clean: dealii
 	+make -C ceed clean
 	+make -C mfem clean
 	+make -C nek clean

examples/deal.II/CMakeLists.txt

@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 3.5.0)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.10.0)
 
 FIND_PACKAGE(deal.II 8.0 QUIET
   HINTS ${deal.II_DIR} ${DEAL_II_DIR} ../ ../../ $ENV{DEAL_II_DIR}