Commit eed0fd31 authored by Bernd Flemisch's avatar Bernd Flemisch
Browse files

[buildsystem] merge from strip-pdelab: allow out-of-source builds, make

correct use of wildcards, add ALUGrid flags to tests with AMG.

Merge revisions 12949, 13246 and 13248 from the strip-pdelab branch.
They all improve the buildsystem behavior.

Thanks to Markus Blatt for the work.


git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@13282 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent f3ecfd37
check_PROGRAMS = test_el1p2c
noinst_HEADERS = *.hh
EXTRA_DIST=*.input grids/*.dgf CMakeLists.txt
noinst_HEADERS := $(wildcard *.hh)
EXTRA_DIST:=$(wildcard *.input) grids/$(wildcard *.dgf) CMakeLists.txt
test_el1p2c_SOURCES = test_el1p2c.cc
......
check_PROGRAMS = test_el2p
noinst_HEADERS = *.hh
EXTRA_DIST= grids/*.dgf co2values.inc CMakeLists.txt
noinst_HEADERS := $(wildcard *.hh)
EXTRA_DIST= grids/$(wildcard *.dgf) co2values.inc CMakeLists.txt
test_el2p_SOURCES = test_el2p.cc
......
check_PROGRAMS = test_elastic
noinst_HEADERS = *.hh
EXTRA_DIST=*.input grids/*.dgf CMakeLists.txt
noinst_HEADERS := $(wildcard *.hh)
EXTRA_DIST:=$(wildcard *.input) grids/$(wildcard *.dgf) CMakeLists.txt
test_elastic_SOURCES = test_elastic.cc
......
......@@ -41,3 +41,5 @@ add_dumux_test(test_cc1pwithamg test_cc1pwithamg test_cc1pwithamg.cc
-Grid.File ${CMAKE_CURRENT_SOURCE_DIR}/grids/test_1p_2d.dgf
-TimeManager.TEnd 1
-TimeManager.DtInitial 1)
add_dune_alugrid_flags(test_cc1pwithamg test_box1pwithamg)
check_PROGRAMS = test_box1p test_cc1p test_box1pwithamg test_cc1pwithamg
noinst_HEADERS = *.hh
EXTRA_DIST=*.input grids/*.dgf CMakeLists.txt
noinst_HEADERS := $(wildcard *.hh)
EXTRA_DIST:=$(wildcard *.input) grids/$(wildcard *.dgf) CMakeLists.txt
test_box1p_SOURCES = test_box1p.cc
test_cc1p_SOURCES = test_cc1p.cc
......
check_PROGRAMS = test_box1p2c test_cc1p2c
noinst_HEADERS = *.hh
EXTRA_DIST=*.input grids/*.dgf CMakeLists.txt
noinst_HEADERS := $(wildcard *.hh)
EXTRA_DIST:=$(wildcard *.input) grids/$(wildcard *.dgf) CMakeLists.txt
test_box1p2c_SOURCES = test_box1p2c.cc
test_cc1p2c_SOURCES = test_cc1p2c.cc
......
check_PROGRAMS = test_box2p test_cc2p
noinst_HEADERS = *.hh
EXTRA_DIST=*.input grids/*.dgf CMakeLists.txt
noinst_HEADERS := $(wildcard *.hh)
EXTRA_DIST:=$(wildcard *.input) grids/$(wildcard *.dgf) CMakeLists.txt
test_box2p_SOURCES = test_box2p.cc
test_cc2p_SOURCES = test_cc2p.cc
......
check_PROGRAMS = test_box2p2c test_cc2p2c
noinst_HEADERS = *.hh
EXTRA_DIST=*.input grids/*.dgf CMakeLists.txt
noinst_HEADERS := $(wildcard *.hh)
EXTRA_DIST:=$(wildcard *.input) grids/$(wildcard *.dgf) CMakeLists.txt
test_box2p2c_SOURCES = test_box2p2c.cc
test_cc2p2c_SOURCES = test_cc2p2c.cc
......
check_PROGRAMS = test_box2p2cni test_cc2p2cni
noinst_HEADERS = *.hh
EXTRA_DIST=*.input grids/*.dgf CMakeLists.txt
noinst_HEADERS := $(wildcard *.hh)
EXTRA_DIST:=$(wildcard *.input) grids/$(wildcard *.dgf) CMakeLists.txt
test_box2p2cni_SOURCES = test_box2p2cni.cc
test_cc2p2cni_SOURCES = test_cc2p2cni.cc
......
......@@ -2,7 +2,7 @@ check_PROGRAMS = test_2pdfm
test_2pdfm_SOURCES = test_2pdfm.cc
noinst_HEADERS = *.hh
EXTRA_DIST=*.input grids/2pdfmartmesh.net CMakeLists.txt
noinst_HEADERS := $(wildcard *.hh)
EXTRA_DIST:=$(wildcard *.input) grids/2pdfmartmesh.net CMakeLists.txt
include $(top_srcdir)/am/global-rules
check_PROGRAMS = test_box2pni test_cc2pni
noinst_HEADERS = *.hh
EXTRA_DIST=*.input grids/*.dgf CMakeLists.txt
noinst_HEADERS := $(wildcard *.hh)
EXTRA_DIST:=$(wildcard *.input) grids/$(wildcard *.dgf) CMakeLists.txt
test_box2pni_SOURCES = test_box2pni.cc
test_cc2pni_SOURCES = test_cc2pni.cc
......
check_PROGRAMS = test_box3p test_cc3p
noinst_HEADERS = *.hh
EXTRA_DIST = *.input grids/*.dgf CMakeLists.txt
noinst_HEADERS := $(wildcard *.hh)
EXTRA_DIST := $(wildcard *.input) grids/$(wildcard *.dgf) CMakeLists.txt
test_box3p_SOURCES = test_box3p.cc
test_cc3p_SOURCES = test_cc3p.cc
......
check_PROGRAMS = test_box3p3c test_cc3p3c
noinst_HEADERS = *.hh
EXTRA_DIST=*.input grids/*.dgf CMakeLists.txt
noinst_HEADERS := $(wildcard *.hh)
EXTRA_DIST:=$(wildcard *.input) grids/$(wildcard *.dgf) CMakeLists.txt
test_box3p3c_SOURCES = test_box3p3c.cc
test_cc3p3c_SOURCES = test_cc3p3c.cc
......
check_PROGRAMS = test_box3p3cni test_cc3p3cni
noinst_HEADERS = *.hh
EXTRA_DIST=*.input grids/*.dgf CMakeLists.txt
noinst_HEADERS := $(wildcard *.hh)
EXTRA_DIST:=$(wildcard *.input) grids/$(wildcard *.dgf) CMakeLists.txt
test_box3p3cni_SOURCES = test_box3p3cni.cc
test_cc3p3cni_SOURCES = test_cc3p3cni.cc
......
check_PROGRAMS = test_boxco2 test_ccco2
noinst_HEADERS = *.hh
EXTRA_DIST = CMakeLists.txt *.input grids/*.dgf co2values.inc
noinst_HEADERS := $(wildcard *.hh)
EXTRA_DIST = CMakeLists.txt $(wildcard *.input) grids/$(wildcard *.dgf) co2values.inc
test_boxco2_SOURCES = test_boxco2.cc
test_ccco2_SOURCES = test_ccco2.cc
......
check_PROGRAMS = test_boxco2ni test_ccco2ni
noinst_HEADERS = *.hh
EXTRA_DIST = CMakeLists.txt *.input grids/*.dgf co2values.inc
noinst_HEADERS := $(wildcard *.hh)
EXTRA_DIST = CMakeLists.txt $(wildcard *.input) grids/$(wildcard *.dgf) co2values.inc
test_boxco2ni_SOURCES = test_boxco2ni.cc
test_ccco2ni_SOURCES = test_ccco2ni.cc
......
check_PROGRAMS = test_boxmpnc test_ccmpnc test_forchheimer2p test_forchheimer1p test_boxmpnckinetic test_boxmpncthermalnonequil
noinst_HEADERS = *.hh
noinst_HEADERS := $(wildcard *.hh)
EXTRA_DIST= *.input CMakeLists.txt grids/*.dgf
EXTRA_DIST:= $(wildcard *.input) CMakeLists.txt grids/$(wildcard *.dgf)
gridsdir=$(datadir)/dumux/grids
grids_DATA=grids/*.dgf
grids_DATA=grids/$(wildcard *.dgf)
test_boxmpnc_SOURCES = test_boxmpnc.cc
test_ccmpnc_SOURCES = test_ccmpnc.cc
......
check_PROGRAMS = test_boxrichards test_ccrichards
noinst_HEADERS = *.hh
EXTRA_DIST=*.input grids/*.dgf CMakeLists.txt
noinst_HEADERS := $(wildcard *.hh)
EXTRA_DIST:=$(wildcard *.input) grids/$(wildcard *.dgf) CMakeLists.txt
test_boxrichards_SOURCES = test_boxrichards.cc
test_ccrichards_SOURCES = test_ccrichards.cc
......
......@@ -3,5 +3,5 @@ check_PROGRAMS = test_fluidsystems
test_fluidsystems_SOURCES = test_fluidsystems.cc
EXTRA_DIST=CMakeLists.txt
noinst_HEADERS=*.hh
noinst_HEADERS:=$(wildcard *.hh)
include $(top_srcdir)/am/global-rules
......@@ -8,8 +8,8 @@ headercheck_IGNORE = \
stokes2cnisubproblem.hh
endif
noinst_HEADERS = *.hh
EXTRA_DIST = *.input grids/*.dgf CMakeLists.txt
noinst_HEADERS := $(wildcard *.hh)
EXTRA_DIST := $(wildcard *.input) grids/$(wildcard *.dgf) CMakeLists.txt
test_2cnistokes2p2cni_SOURCES = test_2cnistokes2p2cni.cc
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment