From: bangerth Date: Thu, 28 Oct 2010 15:36:32 +0000 (+0000) Subject: Make sure the program is not compiled/run when not using PETSc or P4EST or when using... X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=334f350fd2bed5a9a93fe4c864d86b57d644d97e;p=dealii-svn.git Make sure the program is not compiled/run when not using PETSc or P4EST or when using threads. git-svn-id: https://svn.dealii.org/trunk@22539 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/examples/step-40/Makefile b/deal.II/examples/step-40/Makefile index 29c5e1e625..0a60997d43 100644 --- a/deal.II/examples/step-40/Makefile +++ b/deal.II/examples/step-40/Makefile @@ -52,26 +52,18 @@ include $D/common/Make.global_options # # The same holds true if we use threads: PETSc and threads doesn't # seem to work well together... -ifneq ($(USE_CONTRIB_PETSC)$(enable-threads),yesno) - ifneq ($(USE_CONTRIB_PETSC),yes) +ifneq ($(USE_CONTRIB_PETSC)$(enable-threads)$(USE_CONTRIB_P4EST),yesnoyes) default run clean: @echo @echo "===========================================================" - @echo "= This program cannot be compiled without PETSc. Make =" - @echo "= sure you have PETSc installed and detected during =" - @echo "= configuration of deal.II =" + @echo "= This program can only be run with the following =" + @echo "= configuration: =" + @echo "= - with PETSc =" + @echo "= - without threads =" + @echo "= - with P4EST =" + @echo "= At least one of these conditions is not satisfied. =" @echo "===========================================================" @echo - else -default run clean: - @echo - @echo "===========================================================" - @echo "= PETSc can not be used when running programs on =" - @echo "= multiple threads. Make sure you have specified the =" - @echo "= --disable-threads flag upon configuration of deal.II =" - @echo "===========================================================" - @echo - endif else # ################################################################