From cf480a759e31c65fba6df79a709d9dbe1175039c Mon Sep 17 00:00:00 2001 From: Christoph Grueninger <christoph.grueninger@iws.uni-stuttgart.de> Date: Thu, 27 Mar 2014 13:31:08 +0000 Subject: [PATCH] [autotools] Build multidomain tests only if multidomain found. Additionally headercheck ignores the multidomain headers, if multidomain is not found. (reviewed by martins) git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@12679 2fb0f335-1f38-0410-981e-8018bf24f1b0 --- dumux/multidomain/2cnistokes2p2cni/Makefile.am | 4 ++++ dumux/multidomain/2cstokes2p2c/Makefile.am | 6 ++++++ dumux/multidomain/common/Makefile.am | 16 ++++++++++++++++ .../couplinglocalresiduals/Makefile.am | 9 +++++++++ test/multidomain/2cnistokes2p2cni/Makefile.am | 10 +++++++++- test/multidomain/2cstokes2p2c/Makefile.am | 10 +++++++++- 6 files changed, 53 insertions(+), 2 deletions(-) diff --git a/dumux/multidomain/2cnistokes2p2cni/Makefile.am b/dumux/multidomain/2cnistokes2p2cni/Makefile.am index 3b00952d82..003f38efe6 100644 --- a/dumux/multidomain/2cnistokes2p2cni/Makefile.am +++ b/dumux/multidomain/2cnistokes2p2cni/Makefile.am @@ -1,4 +1,8 @@ 2cnistokes2p2cnidir = $(includedir)/dumux/multidomain/2cnistokes2p2cni 2cnistokes2p2cni_HEADERS = *.hh +if !HAVE_DUNE_MULTIDOMAIN +headercheck_IGNORE = 2cnistokes2p2cnilocaloperator.hh +endif + include $(top_srcdir)/am/global-rules diff --git a/dumux/multidomain/2cstokes2p2c/Makefile.am b/dumux/multidomain/2cstokes2p2c/Makefile.am index 1a0b337286..347b9a5148 100644 --- a/dumux/multidomain/2cstokes2p2c/Makefile.am +++ b/dumux/multidomain/2cstokes2p2c/Makefile.am @@ -1,4 +1,10 @@ 2cstokes2p2cdir = $(includedir)/dumux/multidomain/2cstokes2p2c 2cstokes2p2c_HEADERS = *.hh +if !HAVE_DUNE_MULTIDOMAIN +headercheck_IGNORE = \ + 2cstokes2p2clocaloperator.hh \ + 2cstokes2p2cnewtoncontroller.hh +endif + include $(top_srcdir)/am/global-rules diff --git a/dumux/multidomain/common/Makefile.am b/dumux/multidomain/common/Makefile.am index 1c56fe2eca..ada66d91e8 100644 --- a/dumux/multidomain/common/Makefile.am +++ b/dumux/multidomain/common/Makefile.am @@ -1,4 +1,20 @@ commondir = $(includedir)/dumux/multidomain/common common_HEADERS = *.hh +if !HAVE_DUNE_MULTIDOMAIN +headercheck_IGNORE = \ + multidomainassembler.hh \ + multidomainmodel.hh \ + multidomainproperties.hh \ + splitandmerge.hh \ + multidomainconvergencewriter.hh \ + multidomainnewtoncontroller.hh \ + multidomainpropertydefaults.hh \ + subdomainproperties.hh \ + multidomainlocaloperator.hh \ + multidomainproblem.hh \ + pdelablocaloperator.hh \ + subdomainpropertydefaults.hh +endif + include $(top_srcdir)/am/global-rules diff --git a/dumux/multidomain/couplinglocalresiduals/Makefile.am b/dumux/multidomain/couplinglocalresiduals/Makefile.am index 9e02ea7ece..ba47b95735 100644 --- a/dumux/multidomain/couplinglocalresiduals/Makefile.am +++ b/dumux/multidomain/couplinglocalresiduals/Makefile.am @@ -1,4 +1,13 @@ couplinglocalresidualsdir = $(includedir)/dumux/multidomain/couplinglocalresiduals couplinglocalresiduals_HEADERS = *.hh +if !HAVE_DUNE_MULTIDOMAIN +headercheck_IGNORE = \ + 2p2ccouplinglocalresidual.hh \ + boxcouplinglocalresidual.hh \ + stokesncnicouplinglocalresidual.hh \ + 2p2cnicouplinglocalresidual.hh \ + stokesnccouplinglocalresidual.hh +endif + include $(top_srcdir)/am/global-rules diff --git a/test/multidomain/2cnistokes2p2cni/Makefile.am b/test/multidomain/2cnistokes2p2cni/Makefile.am index e6520df3f3..7be7032d48 100644 --- a/test/multidomain/2cnistokes2p2cni/Makefile.am +++ b/test/multidomain/2cnistokes2p2cni/Makefile.am @@ -1,5 +1,13 @@ -# tests where program to build and program to run are equal +if HAVE_DUNE_MULTIDOMAIN check_PROGRAMS = test_2cnistokes2p2cni +else +headercheck_IGNORE = \ + 2cnistokes2p2cniproblem.hh \ + 2cnistokes2p2cnispatialparams.hh \ + 2p2cnisubproblem.hh \ + stokes2cnisubproblem.hh +endif + test_2cnistokes2p2cni_SOURCES = test_2cnistokes2p2cni.cc include $(top_srcdir)/am/global-rules diff --git a/test/multidomain/2cstokes2p2c/Makefile.am b/test/multidomain/2cstokes2p2c/Makefile.am index ac442bfc93..520fb1d54b 100644 --- a/test/multidomain/2cstokes2p2c/Makefile.am +++ b/test/multidomain/2cstokes2p2c/Makefile.am @@ -1,5 +1,13 @@ -# tests where program to build and program to run are equal +if HAVE_DUNE_MULTIDOMAIN check_PROGRAMS = test_2cstokes2p2c +else +headercheck_IGNORE = \ + 2cstokes2p2cproblem.hh \ + 2cstokes2p2cspatialparams.hh \ + 2p2csubproblem.hh \ + stokes2csubproblem.hh +endif + test_2cstokes2p2c_SOURCES = test_2cstokes2p2c.cc include $(top_srcdir)/am/global-rules -- GitLab