diff --git a/.gitignore b/.gitignore
index e1c152ed6096269ee44463214080629d8b24ec27..4fc508dcbcaf6897355b5724dfde6f0b5c7f5595 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,11 @@
Makefile
Makefile.in
-config.guess
-config.h.in
-config.log
+config.guess
+config.h.in
+config.log
config.status
-config.h
-config.lt
+config.h
+config.lt
config.sub
configure
configure
@@ -23,12 +23,13 @@ stamp-h1
dune-common-*.tar.gz
dune-common-?.?
ltmain.sh
-.libs
-.deps
+.libs/
+.deps/
+*.la
+*.o
+*.lo
+test-driver
dependencies.m4
dune.css
-config.h.in
-config.h
-config.log
-config.guess
-
+build-cmake/
+*~
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1b7cb29caa5e09336cdaea4db7aa952132bbc5b8..81b1161e7deb61164f3735e2eff38c076386211e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,10 +3,10 @@ project("dune-common" C CXX)
# general stuff
cmake_minimum_required(VERSION 2.8.6)
-message("CMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}|")
+
# make sure our own modules are found
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake/modules")
-message("CMAKE_MODULE_PATH=${CMAKE_MODULE_PATH}")
+
# set the script dir for the macros.
set(DUNE_COMMON_SCRIPT_DIR "${PROJECT_SOURCE_DIR}/cmake/scripts")
diff --git a/COPYING b/COPYING
index 53e3be2814e6d0ecfddded421ff5affdbde4d231..ae7026c24d347f09623206d5007d6be123b89482 100644
--- a/COPYING
+++ b/COPYING
@@ -16,7 +16,7 @@ Copyright holders:
2012 Arne Morten Kvarving
2009 Leonard Kern
2005--2007 Sreejith Pulloor Kuttanikkad
-2003--2012 Robert Klöfkorn
+2003--2013 Robert Klöfkorn
2010--2013 Andreas Lauser
2007--2011 Sven Marnach
2012 Tobias Malkmus
diff --git a/bin/.gitignore b/bin/.gitignore
index 7c78bf9ea7db344178a60fec44884be70d54bdce..ef40ed324c9dd66001cee9c6cc6d0c6287df03e1 100644
--- a/bin/.gitignore
+++ b/bin/.gitignore
@@ -1,7 +1,7 @@
Makefile
Makefile.in
-.deps
semantic.cache
check-log-store
-
*.swp
+xfail-compile-tests.log
+xfail-compile-tests.trs
diff --git a/bin/am2cmake.py b/bin/am2cmake.py
index 2c50a1ce2c94eacb15fa836163202ff0d4db8026..c8f00f0a293c24c8290779fbbfbef0e7ce369409 100755
--- a/bin/am2cmake.py
+++ b/bin/am2cmake.py
@@ -238,7 +238,7 @@ def rename_var(tokens):
'GMP': 'GMP_FOUND',
'GRAPE': 'GRAPE_FOUND',
'INKSCAPE': 'INKSCAPE_FOUND',
- 'MPI': 'MPI_FOUND',
+ 'MPI': 'MPI_CXX_FOUND',
'PARDISO': 'PARDISO_FOUND',
'PETSC': 'PETSC_FOUND',
'PSURFACE': 'PSURFACE_FOUND',
@@ -824,7 +824,7 @@ def am_2_cmake(amfile, cmakefile, module_root=False):
input = open(amfile, 'r')
lines = input.readlines()
str = ''.join(lines)
- output.write(am_2_cmake_string(str))
+ output.write(re.sub('\s+\n', '\n', am_2_cmake_string(str)))
input.close()
if module_root:
output.write(finalize_cmake_module(module_name))
diff --git a/bin/dunecontrol b/bin/dunecontrol
index c4ce718aabc5e36ccfe25ea431f3acf30f8490a3..c8c7a0c2babb6008ae4580474b80dab169f3a503 100755
--- a/bin/dunecontrol
+++ b/bin/dunecontrol
@@ -45,7 +45,7 @@ canonicalname(){
fdir="`canonicalname \"$fdir\"`"
echo "$fdir/$fname"
fi
- # if this is a directory, then create an absolute
+ # if this is a directory, then create an absolute
# directory name and we are done
if test -d "$file"; then
(cd "$file"; pwd)
@@ -126,7 +126,7 @@ build_module() {
# disable usage of opts file
if test "x$DUNE_OPTS_FILE" != "x"; then
echo "WARNING: commandline parameters will overwrite setting in opts file \"$DUNE_OPTS_FILE\""
- fi
+ fi
fi
# skip command delimiter
@@ -146,7 +146,7 @@ build_module() {
eval_control $runcommand $path/$CONTROL
); then eval echo "--- Failed to build \$NAME_${module} ---"; exit 1; fi
trap onfailure EXIT
-
+
eval echo "--- \$NAME_${module} done ---"
done
}
@@ -165,10 +165,13 @@ load_opts() {
local CMD_FLAGS_FROM_FILE=""
BUILDDIR=$DUNE_BUILDDIR
if test "x$DUNE_OPTS_FILE" != "x"; then
- # use build dir from opts file if set
- OPTS_FILE_BUILDDIR="$(eval BUILDDIR=""; . $DUNE_OPTS_FILE; eval echo \$BUILDDIR)"
- if test -n "$OPTS_FILE_BUILDDIR"; then
- BUILDDIR="$OPTS_FILE_BUILDDIR"
+ if test -z "$BUILDDIR"; then
+ # no builddir set yet, use build dir from opts file if set
+ # Note: if --use-buiddir is used BUILDDIR will be set already
+ OPTS_FILE_BUILDDIR="$(eval BUILDDIR=""; . $DUNE_OPTS_FILE; eval echo \$BUILDDIR)"
+ if test -n "$OPTS_FILE_BUILDDIR"; then
+ BUILDDIR="$OPTS_FILE_BUILDDIR"
+ fi
fi
CMAKE_FLAGS="$(. $DUNE_OPTS_FILE; eval echo \$CMAKE_FLAGS)"
CMD_FLAGS_FROM_FILE="$(eval ${COMMAND}_FLAGS=""; . $DUNE_OPTS_FILE; eval echo \$${COMMAND}_FLAGS)"
@@ -221,7 +224,7 @@ esac'
}
# list of all dunecontrol commands
-COMMANDS="printdeps vcsetup update autogen configure make all exec bexec status svn"
+COMMANDS="printdeps vcsetup update autogen configure make all exec bexec status svn git"
# help string for the commands
printdeps_HELP="print recursive dependencies of a module"
@@ -235,6 +238,7 @@ exec_HELP="execute an arbitrary command in each module source directory"
bexec_HELP="execute an arbitrary command in each module build directory"
status_HELP="show vc status for all modules"
svn_HELP="\trun svn command for each svn managed module"
+git_HELP="\trun git command for each git managed module"
#
# setup command proxies
@@ -246,7 +250,7 @@ for command in $COMMANDS; do
done
#
-# default implementations for commands...
+# default implementations for commands...
# these can be overwritten in the $CONTROL files
#
@@ -263,6 +267,17 @@ run_default_bexec () {
run_default_status () {
local verbose=0
local update=""
+ local is_git=""
+ local is_svn=""
+ name="$(eval echo \$NAME_$module)"
+
+ if test -d .git; then is_git=1; fi
+ if test -d .svn; then is_svn=1; fi
+ if test ! "$is_svn" -a ! "$is_git" ; then
+ echo "module $name not under known version control"
+ return
+ fi
+
for i in $CMD_FLAGS; do
if eval test "x$i" = "x-v"; then verbose=1; fi
if eval test "x$i" = "x-vv"; then verbose=2; fi
@@ -277,16 +292,24 @@ run_default_status () {
fi
if test $verbose -eq 1; then
- svn status $update | grep -E "^M|^A|^D|^C|^U"
+ test "$is_svn" && svn status $update | grep -E "^M|^A|^D|^C|^U"
+ test "$is_git" && git status -uno
elif test $verbose -eq 2; then
- svn status $update
+ test "$is_svn" && svn status $update
+ test "$is_git" && git status
fi
- name="$(eval echo \$NAME_$module)"
- changed=$(svn status | grep -E "^M|^A|^D" | wc -l)
- collisions=$(svn status | grep -E "^C"| wc -l)
- pending=$(svn status $update | grep -E "^...... \* " | wc -l)
+ if test "$is_svn" ; then
+ changed=$(svn status | grep -E "^M|^A|^D" | wc -l)
+ collisions=$(svn status | grep -E "^C"| wc -l)
+ pending=$(svn status $update | grep -E "^...... \* " | wc -l)
+ fi
+ if test "$is_git" ; then
+ changed=$(git status --porcelain | grep -E "^ *M|^ *A|^ *D|^ *R|^ *C" | wc -l)
+ collisions=$(git status --porcelain | grep -E "^ *U"| wc -l)
+ pending=$(git status | grep -E "^\# Your branch is ahead |^\# Your branch is behind " | wc -l)
+ fi
color=$green
text="no changes"
if [ $changed -eq 0 ]; then
@@ -325,7 +348,8 @@ run_default_vcsetup() {
eval "$CMD_FLAGS"
fi
- if [ -d .git ]; then
+ # Check for both a file and a directory to cope with Git submodules
+ if [ -d .git -o -f .git ] ; then
# Read Whitespace-Hook setting from dune.module file
local SETUPGITHOOK="$($GREP -i "^[$BLANK]*Whitespace-Hook:" dune.module | cut -d ':' -f2 | eval $PARSER_TRIM | tr '[:upper:]' '[:lower:]')"
@@ -333,33 +357,44 @@ run_default_vcsetup() {
if [ "x$SETUPGITHOOK" = "xyes" ]; then
# we have to install the Git whitespace hook
+ # The current Git repository might be a submodule, so we have to start by
+ # determining the location of the commit hook
+
+ if [ -f .git ] ; then
+ # submodule -> .git contains a pointer to the repository
+ GITHOOKPATH="$(sed 's/gitdir: //' < .git)/hooks/pre-commit"
+ else
+ # standard case, .git is the repository
+ GITHOOKPATH=.git/hooks/pre-commit
+ fi
+
if [ -n "$DISABLEWHITESPACEHOOK" ] ; then
# the user doesn't want the Git whitespace hook - deinstall it if necessary and warn the user
echo "WARNING: The current module wants to install the DUNE whitespace hook, but you have disabled the hook in your options!"
echo "WARNING: You will have to make sure that your commits don't introduce any trailing whitespace or indentation with tabs!"
echo "WARNING: Otherwise, your commits might be rejected when trying to push them to an official repository!"
- if [ -e .git/hooks/pre-commit ]; then
+ if [ -e "$GITHOOKPATH" ]; then
# there is a pre-commit hook, check whether it is our whitespace hook
- local HOOKTAG="$(head -n 2 .git/hooks/pre-commit | tail -n 1)"
+ local HOOKTAG="$(eval head -n 2 \"$GITHOOKPATH\" | tail -n 1)"
if [ "x$HOOKTAG" = "x# dune-git-whitespace-hook" ]; then
echo "--> Removing DUNE whitespace hook as requested by the user"
- rm .git/hooks/pre-commit
+ rm "$GITHOOKPATH"
fi
fi
else
# standard handling of Git whitespace hook
- if [ ! -e .git/hooks/pre-commit ]; then
+ if [ ! -e "$GITHOOKPATH" ]; then
# there is no hook yet, we can safely install ours
echo "--> Installing Git pre-commit hook to enforce whitespace policy"
- cp -p $PREFIX_DIR/bin/git-whitespace-hook .git/hooks/pre-commit
+ cp -p "$PREFIX_DIR/bin/git-whitespace-hook" "$GITHOOKPATH"
else
# there is already a hook, check whether it is our whitespace hook
- local HOOKTAG="$(head -n 2 .git/hooks/pre-commit | tail -n 1)"
+ local HOOKTAG="$(eval head -n 2 \"$GITHOOKPATH\" | tail -n 1)"
if [ "x$HOOKTAG" = "x# dune-git-whitespace-hook" ]; then
- if [ $PREFIX_DIR/bin/git-whitespace-hook -nt .git/hooks/pre-commit ]; then
+ if [ "$PREFIX_DIR/bin/git-whitespace-hook" -nt "$GITHOOKPATH" ]; then
echo "--> Updating Git pre-commit hook with newer version"
- cp -p $PREFIX_DIR/bin/git-whitespace-hook .git/hooks/pre-commit
+ cp -p "$PREFIX_DIR/bin/git-whitespace-hook" "$GITHOOKPATH"
fi
else
echo "WARNING: Existing pre-commit hook found!"
@@ -411,7 +446,7 @@ run_default_vcsetup() {
fi
# Run custom setup scripts
- if [ -d .git -o -d .svn -o -d CVS -o -f stamp-vc ]; then
+ if [ -d .git -o -f .git -o -d .svn -o -d CVS -o -f stamp-vc ]; then
if [ -d .vcsetup/run.d ]; then
for SCRIPT in .vcsetup/run.d/* ; do
if [ -x "$SCRIPT" ]; then
@@ -480,7 +515,7 @@ run_default_autogen () {
else
echo Skipping dune-autogen
fi
- else
+ else
echo Skipping dune-autogen because of CMake
fi
}
@@ -489,10 +524,10 @@ run_default_configure () {
PARAMS="$CMD_FLAGS"
if test "x$USE_CMAKE" = "xyes" && test -e $(eval "echo \$PATH_$module")/CMakeLists.txt; then
LOCAL_USE_CMAKE=yes
- else
+ else
LOCAL_USE_CMAKE=no
fi
- echo "LOCAL_USE_CMAKE=$LOCAL_USE_CMAKE $(eval "echo \$PATH_$module")/CMakeLists.txt"
+
if test -x configure || test "x$LOCAL_USE_CMAKE" = "xyes" ; then
ACLOCAL_FLAGS="-I ."
if test -d "m4"; then
@@ -508,7 +543,6 @@ run_default_configure () {
# Translate the configure PARMS to cmake
export PARAMS
export CMAKE_PARAMS
- echo module_translate_options_am2cmake $m $path/lib
module_translate_options_am2cmake $m $path/lib
fi
if test x$module = x$m; then continue; fi # skip myself
@@ -540,16 +574,24 @@ run_default_configure () {
if test "x$HAVE_duneweb" == "xyes"; then
PARAMS="$PARAMS \"--with-duneweb=$PATH_duneweb\""
fi
- PARAMS="$PARAMS ACLOCAL_AMFLAGS=\"$ACLOCAL_FLAGS\""
if test "x$LOCAL_USE_CMAKE" = "xyes"; then
+ # we have to export the compiler and compiler flags
+ # such that they are honored by cmake.
+ flags="CXX CC CXXFLAGS CFLAGS CPPFLAGS LDFLAGS F77 FFLAGS FLIBS FC FCFLAGS FCLIBS LIBS"
+ for i in $flags; do
+ cflags=`echo "$PARAMS" | sed "s/.*\($i=\"[^\"]*\"\|$i='[^']*'\|$i=[^\s^ ]*\).*/\1/"`
+ if test "$cflags" != "$PARAMS"; then
+ PREPARAMS="$PREPARAMS $cflags"
+ fi
+ done
test -d "$BUILDDIR" || mkdir "$BUILDDIR"
SRCDIR="$PWD"
cd "$BUILDDIR"
- echo `pwd`
- echo "cmake -DBUILD_SHARED_LIBS:BOOL=OFF -DCMAKE_MODULE_PATH=\"$CMAKE_MODULE_PATH\" $CMAKE_PARAMS $CMAKE_FLAGS $SRCDIR"
- eval cmake "-DBUILD_SHARED_LIBS:BOOL=OFF -DCMAKE_MODULE_PATH=\"$CMAKE_MODULE_PATH\" $CMAKE_PARAMS $CMAKE_FLAGS $SRCDIR" || exit 1
+ echo "$PREPARAMS cmake -DBUILD_SHARED_LIBS:BOOL=OFF -DCMAKE_MODULE_PATH=\"$CMAKE_MODULE_PATH\" $CMAKE_PARAMS $CMAKE_FLAGS $SRCDIR"
+ eval $PREPARAMS cmake "-DBUILD_SHARED_LIBS:BOOL=OFF -DCMAKE_MODULE_PATH=\"$CMAKE_MODULE_PATH\" $CMAKE_PARAMS $CMAKE_FLAGS $SRCDIR" || exit 1
else
+ PARAMS="$PARAMS ACLOCAL_AMFLAGS=\"$ACLOCAL_FLAGS\""
echo ./configure "$PARAMS"
# create build directory of requested
if test -n "$BUILDDIR"; then
@@ -596,6 +638,13 @@ run_default_svn () {
fi
}
+run_default_git () {
+ if test -d .git; then
+ PARAMS="$CMD_FLAGS"
+ eval git "$PARAMS"
+ fi
+}
+
###############################################
###
### main
@@ -753,11 +802,11 @@ while test $# -gt 0; do
exit 1
fi
;;
- -h|--help)
+ -h|--help)
command=help
break
;;
- -p|--print)
+ -p|--print)
command=print
break
;;
@@ -840,12 +889,12 @@ done
if test "x$USE_CMAKE" = "xyes"; then
# load general options. DUNE_BUILDDIR might be overwritten in the opts file
load_opts NONE
- if test -z "$DUNE_BUILDDIR"; then
+ if test -z "$BUILDDIR"; then
echo "No build directory provided. Defaulting to the sub directory build-cmake"
- export DUNE_BUILDDIR=build-cmake
+ export BUILDDIR=build-cmake
fi
fi
-echo "USE_CMAKE=$USE_CMAKE DUNE_BUILDDIR=$DUNE_BUILDDIR"
+
# we assume there should be a command...
if test "x$command" = "x"; then
usage
@@ -1017,7 +1066,7 @@ EOF
fi
EOF
done
- ###
+ ###
for mod in $SORTEDMODULES_SUGS; do
name=`eval echo \\$NAME_$mod`
MOD=`echo $mod | tr [:lower:] [:upper:]`
diff --git a/bin/duneproject b/bin/duneproject
index 05eb8d5006bac75a8dd5546224c13e85100ff038..d6377690f96418d5fc4e73e6bef4bb1a93e8d4f1 100755
--- a/bin/duneproject
+++ b/bin/duneproject
@@ -8,7 +8,7 @@
# * Check module names entered as dependencies.
set -e
-set -x
+
canonicalname(){
if test $# -ne 1; then
echo Usage: canonicalname path >&2
@@ -468,6 +468,12 @@ cat> "$PROJECT/CMakeLists.txt" << M_DELIM
cmake_minimum_required(VERSION 2.8.6)
project($PROJECT CXX)
+if(NOT (dune-common_DIR OR dune-common_ROOT OR
+ "\${CMAKE_PREFIX_PATH}" MATCHES ".*dune-common.*"))
+ string(REPLACE \${CMAKE_PROJECT_NAME} dune-common dune-common_DIR
+ \${PROJECT_BINARY_DIR})
+endif()
+
#find dune-common and set the module path
find_package(dune-common)
list(APPEND CMAKE_MODULE_PATH \${dune-common_MODULE_PATH}
diff --git a/bin/git-whitespace-hook b/bin/git-whitespace-hook
index adf649767082b08c39a81313616ebf38bc92d61f..8aadf6eab059573dbad9fee67522acdc5abc209d 100755
--- a/bin/git-whitespace-hook
+++ b/bin/git-whitespace-hook
@@ -14,7 +14,7 @@
# files will be matched against those regexes.
# git-diff-index needs a valid commit to compare to
-if git-rev-parse --verify HEAD 2>/dev/null
+if git rev-parse --verify HEAD >/dev/null 2>&1
then
against=HEAD
else
@@ -65,11 +65,46 @@ else
USER_HAS_CUSTOM_WHITESPACE=1
fi
+# Figure out how to call xargs to make sure it won't invoke its argument with
+# an empty argument list. BSD xargs will not do that by default, while GNU xargs
+# needs -r to do the same. So we start by checking whether xargs does the right
+# thing without options. Now there could be other obscure versions of xargs out
+# there (on clusters etc.) that behave in yet another way, so we try with -r as
+# well. If that fails, we throw a big error message at the user.
+
+# In the following line, xargs should not call false, so the return value should be 0.
+echo "" | xargs false
+
+if [ $? -ne 0 ]; then
+ # Let's try with -r
+ echo "" | xargs -r false
+ if [ $? -ne 0 ]; then
+ # Houston, we have a problem
+ if [ -z "$DUNE_WHITESPACE_IGNORE_XARGS" ]; then
+ echo "You seem to be lacking a version of xargs that is compatible to either BSD or GNU!" 1>&2
+ echo "Please file a bug report at http://dune-project.org about this issue with your exact operating system type and version!" 1>&2
+ echo "You can still use this hook by setting the environment variable DUNE_WHITESPACE_IGNORE_XARGS to 1, but please be aware" 1>&2
+ echo "that the hook might create false positives." 1>&2
+ echo "==============================================================" 1>&2
+ echo "Aborting the commit..." 1>&2
+ exit 99
+ else
+ SILENTXARGS=xargs
+ fi
+ else
+ SILENTXARGS="xargs -r"
+ fi
+else
+ SILENTXARGS=xargs
+fi
+
+
fail=0
done=0
-restore_config()
+do_cleanup()
{
+
if [ $done -ne 1 ];
then
echo "Error while executing whitespace checking pre-commit hook!" 1>&2
@@ -88,7 +123,7 @@ restore_config()
exit $fail
}
-trap restore_config EXIT
+trap do_cleanup EXIT
# set custom value
git config --replace-all core.whitespace trailing-space
@@ -98,7 +133,7 @@ then
git diff-index --check --cached $against --
result=$?
else
- git diff-index --cached --name-only $against | perl -ne "print if /$TRAILING_WHITESPACE_FILES/" | xargs git diff-index --check --cached $against --
+ git diff-index --cached --name-only $against | perl -ne "print if /$TRAILING_WHITESPACE_FILES/" | $SILENTXARGS git diff-index --check --cached $against --
result=$?
fi
@@ -114,7 +149,7 @@ then
git diff-index --check --cached $against --
result=$?
else
- git diff-index --cached --name-only $against | perl -ne "print if /$TAB_IN_INDENT_FILES/" | xargs git diff-index --check --cached $against --
+ git diff-index --cached --name-only $against | perl -ne "print if /$TAB_IN_INDENT_FILES/" | $SILENTXARGS git diff-index --check --cached $against --
result=$?
fi
diff --git a/cmake/modules/CMakeLists.txt b/cmake/modules/CMakeLists.txt
index 00e6852a10d206c33b990005680e130fbdeabda3..cee14ed1ca7d33ed5d227337cbab5bbd11a21408 100644
--- a/cmake/modules/CMakeLists.txt
+++ b/cmake/modules/CMakeLists.txt
@@ -10,6 +10,7 @@ set(modules DuneBoost.cmake
DuneTestMacros.cmake
DuneTests.cmake
FindBoostFusion.cmake
+ FindCXX11Conditional.cmake
FindCXX11Features.cmake
FindGMP.cmake
FindInkscape.cmake
diff --git a/cmake/modules/DuneBoost.cmake b/cmake/modules/DuneBoost.cmake
index 636dda3260347275e6f06011899af362735ece9b..8e5bf97606410ef85382dfe10d3aaa569dbdec68 100644
--- a/cmake/modules/DuneBoost.cmake
+++ b/cmake/modules/DuneBoost.cmake
@@ -1,17 +1,27 @@
# Searches for boost and provides the following function:
#
-# add_dune_boost_flags(targets)
+# add_dune_boost_flags(targets [LINK_ALL_BOOST_LIBRARIES]
+# LIBRARIES lib1 lib2 ...)
#
# Adds boost compiler flags and libraries, and activates
-# Boost for the specified targets.
+# Boost for the specified targets. Libraries can either be
+# provided by listing them after the LIBRARIES keyword or one
+# can request linking with all available boost libraries by
+# passing the LINK_ALL_BOOST_LIBRARIES option to the function
+# call.
find_package(Boost)
set(HAVE_DUNE_BOOST ${Boost_FOUND})
function(add_dune_boost_flags _targets)
+ cmake_parse_arguments(DUNE_BOOST LINK_ALL_BOOST_LIBRARIES "" LIBRARIES ${ARGN})
if(Boost_FOUND)
include_directories("${Boost_INCLUDE_DIRS}")
foreach(_target ${_targets})
- target_link_libraries(${_target} ${Boost_LIBRARIES})
+ if(DUNE_BOOST_LINK_ALL_BOOST_LIBRARIES)
+ target_link_libraries(${_target} "${DUNE_Boost_LIBRARIES}")
+ else(DUNE_BOOST_LINK_ALL_BOOST_LIBRARIES)
+ target_link_libraries(${_target} "${DUNE_BOOST_LIBRARIES}")
+ endif(DUNE_BOOST_LINK_ALL_BOOST_LIBRARIES)
# The definitions are a hack as we do not seem to know which MPI implementation was
# found.
GET_TARGET_PROPERTY(_props ${_target} COMPILE_FLAGS)
diff --git a/cmake/modules/DuneDoc.cmake b/cmake/modules/DuneDoc.cmake
index ea2858d08e4378a0321ad9ad18890520d2ebbf1d..4b19ccec27588c380ccbcaa28ca0794df709d583 100644
--- a/cmake/modules/DuneDoc.cmake
+++ b/cmake/modules/DuneDoc.cmake
@@ -83,7 +83,6 @@ MACRO(dune_add_latex_document tex_file)
string(REGEX REPLACE "/" "_" "${CMAKE_CURRENT_SOURCE_DIR}/${file}" filevar ${file})
set(filevar "filevar-NOTFOUND")
find_file(filevar ${tex_file} ${CMAKE_CURRENT_SOURCE_DIR})
- message(filevar=${filevar} tex_file=${tex_file} CMAKE_CURRENT_SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR})
if(filevar)
if(LATEX_USABLE)
# add rule to create latex document
diff --git a/cmake/modules/DuneMPI.cmake b/cmake/modules/DuneMPI.cmake
index f6ca504d500593eae263483c358d8d550e731920..99b821098ff5bb0e781fa9180b448c0c51dd2867 100644
--- a/cmake/modules/DuneMPI.cmake
+++ b/cmake/modules/DuneMPI.cmake
@@ -20,7 +20,7 @@
find_package(MPI)
find_package(Threads)
-if(MPI_FOUND)
+if(MPI_CXX_FOUND)
set(HAVE_MPI MPI_CXX_FOUND)
# We do not support the CXX bindings of MPI
set(MPI_DUNE_COMPILE_FLAGS ${MPI_C_COMPILE_FLAGS} CACHE STRING
@@ -43,7 +43,7 @@ if(MPI_FOUND)
set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES};${MPI_DUNE_INCLUDE_PATH})
check_function_exists(MPI_Finalized MPI_2)
cmake_pop_check_state()
-endif(MPI_FOUND)
+endif(MPI_CXX_FOUND)
# adds MPI flags to the targets
function(add_dune_mpi_flags)
@@ -53,7 +53,7 @@ function(add_dune_mpi_flags)
else()
set(_prefix TARGET)
endif()
- if(MPI_FOUND)
+ if(MPI_CXX_FOUND)
set_property(${_prefix} ${ADD_MPI_UNPARSED_ARGUMENTS} APPEND PROPERTY COMPILE_FLAGS ${MPI_DUNE_COMPILE_FLAGS})
set_property(${_prefix} ${ADD_MPI_UNPARSED_ARGUMENTS} APPEND PROPERTY COMPILE_DEFINITIONS ENABLE_MPI=1
MPICH_SKIP_MPICXX MPIPP_H)
@@ -63,5 +63,5 @@ function(add_dune_mpi_flags)
target_link_libraries(${target} ${MPI_DUNE_LIBRARIES})
endforeach(target ${ADD_MPI_UNPARSED_ARGUMENTS})
endif(NOT (ADD_MPI_SOURCE_ONLY OR ADD_MPI_OBJECT))
- endif(MPI_FOUND)
+ endif(MPI_CXX_FOUND)
endfunction(add_dune_mpi_flags)
diff --git a/cmake/modules/DuneMacros.cmake b/cmake/modules/DuneMacros.cmake
index 8c77a2f0f5750e85c2d1d6750bce89c73ee167ca..ea12136ccf69b4cfd7dbd006cd094c2b83777eda 100644
--- a/cmake/modules/DuneMacros.cmake
+++ b/cmake/modules/DuneMacros.cmake
@@ -8,9 +8,10 @@
# upper_name where all dashes (-) are replaced by underscores (_)
# Example: dune-common -> DUNE_COMMON
#
-# dune_module_information(MODULE_DIR)
+# dune_module_information(MODULE_DIR [QUIET])
#
# Parse ${MODULE_DIR}/dune.module and provide that information.
+# If the second argument is QUIET no status message is printed.
#
#
# dune_project()
@@ -85,6 +86,15 @@ macro(dune_module_to_uppercase _upper _module)
string(REPLACE "-" "_" ${_upper} "${${_upper}}")
endmacro(dune_module_to_uppercase _upper _module)
+macro(find_dune_package module)
+ if(NOT (${module}_DIR OR ${module}_ROOT OR
+ "${CMAKE_PREFIX_PATH}" MATCHES ".*${module}.*"))
+ string(REPLACE ${ProjectName} ${module} ${module}_DIR
+ ${PROJECT_BINARY_DIR})
+ endif()
+ find_package(${ARGV} NO_CMAKE_PACKAGE_REGISTRY)
+endmacro(find_dune_package module)
+
macro(extract_line HEADER OUTPUT FILE_CONTENT)
set(REGEX "${HEADER}[ ]*[^\n]+")
string(REGEX MATCH ${REGEX} OUTPUT1 "${FILE_CONTENT}")
@@ -101,16 +111,16 @@ macro(split_module_version STRING MODULES VERSIONS)
#set(REGEX "dune")
string(REGEX MATCHALL "${REGEX}" matches "${STRING}")
set(${MODULES} "")
- set(${VERSION} "")
+ set(${VERSIONS} "")
foreach(i ${matches})
string(REGEX REPLACE "^([a-zA-Z-]+).*$" "\\1" mod ${i})
string(REGEX MATCH "\\([ ]*(([^ ]+)?[ ]*[^ ]+)[ ]*\\)" have_version
${i})
if(have_version)
string(REGEX REPLACE "^\\([ ]*([^ ]*[ ]*[^ ]+)[ ]*\\)$" "\\1"
- version ${have_version})
+ version ${have_version})
else(have_version)
- set(version >=0.0)
+ set(version >=0.0)
endif(have_version)
list(APPEND ${MODULES} ${mod})
list(APPEND ${VERSIONS} ${version})
@@ -123,6 +133,7 @@ function(convert_deps_to_list var)
endfunction(convert_deps_to_list var)
# add dune-common version from dune.module to config.h
+# optional second argument is verbosity
macro(dune_module_information MODULE_DIR)
file(READ "${MODULE_DIR}/dune.module" DUNE_MODULE)
@@ -168,7 +179,9 @@ macro(dune_module_information MODULE_DIR)
set(${_mod}_REQUIRED REQUIRED)
endforeach(_mod ${DUNE_DEPENDS})
convert_deps_to_list(DUNE_DEPENDS)
- message(STATUS "Dependencies: ${DEPENDS_MODULE} (versions: ${DEPENDS_VERSIONS}) DUNE_DEPENDS=${DUNE_DEPENDS}")
+ if(NOT ("${ARGV1}" STREQUAL QUIET))
+ message(STATUS "Dependencies: ${DEPENDS_MODULE} (versions: ${DEPENDS_VERSIONS}) DUNE_DEPENDS=${DUNE_DEPENDS}")
+ endif(NOT ("${ARGV1}" STREQUAL QUIET))
endif(DUNE_DEPENDS)
# 4. Check for line starting with Suggests
@@ -176,13 +189,15 @@ macro(dune_module_information MODULE_DIR)
if(DUNE_SUGGESTS)
split_module_version(${DUNE_SUGGESTS} SUGGESTS_MODULE SUGGESTS_VERSION)
convert_deps_to_list(DUNE_SUGGESTS)
- message(STATUS "Suggestions: ${SUGGESTS_MODULE} (versions: ${SUGGESTS_VERSIONS}) DUNE_SUGGESTS=${DUNE_SUGGESTS}")
+ if(NOT ("${ARGV1}" STREQUAL QUIET))
+ message(STATUS "Suggestions: ${SUGGESTS_MODULE} (versions: ${SUGGESTS_VERSIONS}) DUNE_SUGGESTS=${DUNE_SUGGESTS}")
+ endif(NOT ("${ARGV1}" STREQUAL QUIET))
endif(DUNE_SUGGESTS)
dune_module_to_uppercase(DUNE_MOD_NAME_UPPERCASE ${DUNE_MOD_NAME})
# set module version
- set(${DUNE_MOD_NAME_UPPERCASE}_VERSION "${DUNE_MOD_VERSION}")
+ set(${DUNE_MOD_NAME_UPPERCASE}_VERSION "${DUNE_MOD_VERSION}")
set(${DUNE_MOD_NAME_UPPERCASE}_VERSION_MAJOR "${DUNE_VERSION_MAJOR}")
set(${DUNE_MOD_NAME_UPPERCASE}_VERSION_MINOR "${DUNE_VERSION_MINOR}")
set(${DUNE_MOD_NAME_UPPERCASE}_VERSION_REVISION "${DUNE_VERSION_REVISION}")
@@ -197,16 +212,16 @@ macro(dune_process_dependency_leafs modules versions is_required next_level_deps
math(EXPR length "${mlength}-1")
foreach(i RANGE 0 ${length})
list(GET mmodules ${i} _mod)
- find_package(${_mod} ${REQUIRED})
+ find_dune_package(${_mod} ${REQUIRED})
if(${_mod}_MODULE_PATH)
- list(APPEND CMAKE_MODULE_PATH ${${_mod}_MODULE_PATH})
+ list(APPEND CMAKE_MODULE_PATH ${${_mod}_MODULE_PATH})
endif(${_mod}_MODULE_PATH)
set(${_mod}_SEARCHED ON)
if(NOT "${is_required}" STREQUAL "")
- set(${_mod}_REQUIRED ON)
- set(${next_level_deps} ${${_mod}_DEPENDS} ${${next_level_deps}})
+ set(${_mod}_REQUIRED ON)
+ set(${next_level_deps} ${${_mod}_DEPENDS} ${${next_level_deps}})
else(NOT "${is_required}" STREQUAL "")
- set(${next_level_sugs} ${${_mod}_DEPENDS} ${${next_level_sugs}})
+ set(${next_level_sugs} ${${_mod}_DEPENDS} ${${next_level_sugs}})
endif(NOT "${is_required}" STREQUAL "")
set(${next_level_sugs} ${${_mod}_SUGGESTS} ${${next_level_sugs}})
endforeach(i RANGE 0 ${length})
@@ -220,11 +235,11 @@ function(remove_processed_modules modules versions is_required)
foreach(i RANGE ${length} 0 -1)
list(GET ${modules} ${i} _mod)
if(${_mod}_SEARCHED)
- list(REMOVE_AT ${modules} ${i})
- list(REMOVE_AT ${versions} ${i})
- if(is_required AND NOT ${_mod}_REQUIRED AND NOT ${_mod}_FOUND)
- message(FATAL_ERROR "Required module ${_mod} not found!")
- endif(is_required AND NOT ${_mod}_REQUIRED AND NOT ${_mod}_FOUND)
+ list(REMOVE_AT ${modules} ${i})
+ list(REMOVE_AT ${versions} ${i})
+ if(is_required AND NOT ${_mod}_REQUIRED AND NOT ${_mod}_FOUND)
+ message(FATAL_ERROR "Required module ${_mod} not found!")
+ endif(is_required AND NOT ${_mod}_REQUIRED AND NOT ${_mod}_FOUND)
endif(${_mod}_SEARCHED)
endforeach(i RANGE 0 ${length})
endif(mlength GREATER 0)
@@ -263,16 +278,16 @@ macro(dune_create_dependency_tree)
set(global_depends ${DEPENDS_MODULE})
set(global_suggests ${SUGGESTS_MODULE})
foreach(_mod ${DEPENDS_MODULE})
- find_package(${_mod} REQUIRED)
+ find_dune_package(${_mod} REQUIRED)
if(${_mod}_MODULE_PATH)
- list(APPEND CMAKE_MODULE_PATH ${${_mod}_MODULE_PATH})
+ list(APPEND CMAKE_MODULE_PATH ${${_mod}_MODULE_PATH})
endif(${_mod}_MODULE_PATH)
set(${_mod}_REQUIRED ON)
endforeach(_mod ${DEPENDS_MODULE})
foreach(_mod ${SUGGESTS_MODULE})
- find_package(${_mod})
+ find_dune_package(${_mod})
if(${_mod}_MODULE_PATH)
- list(APPEND CMAKE_MODULE_PATH ${${_mod}_MODULE_PATH})
+ list(APPEND CMAKE_MODULE_PATH ${${_mod}_MODULE_PATH})
endif(${_mod}_MODULE_PATH)
set(${_mod}_REQUIRED ON)
endforeach(_mod ${SUGGESTS_MODULE})
@@ -322,26 +337,28 @@ macro(dune_process_dependency_tree DEPENDS DVERSIONS SUGGESTS SVERSIONS)
dune_module_to_macro(_cmake_mod_name "${_mod}")
set(_macro "${_cmake_mod_name}Macros")
set(_mod_cmake _mod_cmake-NOTFOUND) # Prevent false positives due to caching
- find_file(_mod_cmake ${_macro}.cmake ${CMAKE_MODULE_PATH}
- NO_DEFAULT_PATH)
+ find_file(_mod_cmake
+ ${_macro}.cmake
+ ${CMAKE_MODULE_PATH}
+ NO_DEFAULT_PATH)
if(_mod_cmake)
- message(STATUS "Performing tests specific to ${_mod} from file ${_mod_cmake}.")
- include(${_mod_cmake})
+ message(STATUS "Performing tests specific to ${_mod} from file ${_mod_cmake}.")
+ include(${_mod_cmake})
endif(_mod_cmake)
# Find the module
#find_package(${_mod})
# set includes
dune_module_to_uppercase(_upper_case "${_mod}")
if(${_mod}_INCLUDE_DIRS)
- message(STATUS "Setting ${_mod}_INCLUDE_DIRS=${${_mod}_INCLUDE_DIRS}")
- include_directories("${${_mod}_INCLUDE_DIRS}")
+ message(STATUS "Setting ${_mod}_INCLUDE_DIRS=${${_mod}_INCLUDE_DIRS}")
+ include_directories("${${_mod}_INCLUDE_DIRS}")
endif(${_mod}_INCLUDE_DIRS)
if(${_mod}_LIBRARIES)
message(STATUS "Setting ${_mod}_LIBRARIES=${${_mod}_LIBRARIES}")
- foreach(_lib ${${_mod}_LIBRARIES})
+ foreach(_lib ${${_mod}_LIBRARIES})
list(INSERT DUNE_DEFAULT_LIBS 0 "${_lib}")
list(INSERT DUNE_LIBS 0 "${_lib}")
- endforeach(_lib ${${_mod}_LIBRARIES})
+ endforeach(_lib ${${_mod}_LIBRARIES})
endif(${_mod}_LIBRARIES)
message(STATUS "Dependencies for ${_mod}: ${${_mod}_DEPENDENCIES}")
endif(NOT ${_mod}_PROCESSED)
@@ -353,12 +370,6 @@ endmacro(dune_process_dependency_tree)
# depedencies.
# Don't forget to call finalize_dune_project afterwards.
macro(dune_project)
- # Set the flags
- set(CMAKE_CXX_FLAGS_DEBUG "-g -O0")
- set(CMAKE_C_FLAGS_DEBUG "-g -O0")
- set(CMAKE_CXX_FLAGS_RELEASE "-funroll-loops -O3")
- set(CMAKE_C_FLAGS_RELEASE "-funroll-loops -O3")
-
# extract information from dune.module
dune_module_information(${CMAKE_SOURCE_DIR})
set(ProjectName "${DUNE_MOD_NAME}")
@@ -408,6 +419,7 @@ macro(dune_project)
# set required compiler flags for C++11 (former C++0x)
find_package(CXX11Features)
+ find_package(CXX11Conditional)
include(DuneCxaDemangle)
@@ -463,8 +475,11 @@ macro(dune_project)
set(DUNE_MOD_NAME_CMAKE "${_macro}")
set(_macro "${_macro}Macros")
set(_mod_cmake _mod_cmake-NOTFOUND) # Prevent false positives due to caching
- find_file(_mod_cmake ${_macro}.cmake ${CMAKE_MODULE_PATH}
- ${CMAKE_SOURCE_DIR}/cmake/modules NO_DEFAULT_PATH)
+ find_file(_mod_cmake
+ ${_macro}.cmake
+ ${CMAKE_MODULE_PATH}
+ ${CMAKE_SOURCE_DIR}/cmake/modules
+ NO_DEFAULT_PATH)
if(_mod_cmake)
set(${DUNE_MOD_NAME_CMAKE}_FOUND FOUND)
message(STATUS " Performing tests specific to ${DUNE_MOD_NAME} from file ${_mod_cmake}.")
@@ -475,14 +490,18 @@ macro(dune_project)
include(GNUInstallDirs)
# Set variable where the cmake modules will be installed.
# Thus the user can override it and for example install
- # directly into the CMake installation. This has to be an
- # absolute path. Default: ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/cmake/modules
- if(NOT DEFINED DUNE_INSTALL_MODULEDIR)
- set(DUNE_INSTALL_MODULEDIR ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/cmake/modules
+ # directly into the CMake installation. We use a cache variable
+ # that is overridden by a local variable of the same name if
+ # the user does not explicitely set a value for it. Thus the value
+ # will automatically change if the user changes CMAKE_INSTALL_DATAROOTDIR
+ # or CMAKE_INSTALL_PREFIX
+ if(NOT DUNE_INSTALL_MODULEDIR)
+ set(DUNE_INSTALL_MODULEDIR ""
CACHE PATH
- "Installation directory for CMake modules. Be careful when overriding this as the modules might not be found any more. Might be set to ${CMAKE_ROOT}/Modules or better \${CMAKE_ROOT}/Modules to make the modules available to all CMake runs. This has to be an absolute path. Default: \${CMAKE_INSTALL_PREFIX}/\${CMAKE_INSTALL_DATAROOTDIR}/cmake/modules")
- endif()
-endmacro(dune_project MODULE_DIR)
+ "Installation directory for CMake modules. Default is \${CMAKE_INSTALL_DATAROOTDIR}/cmake/modules when not set explicitely")
+ set(DUNE_INSTALL_MODULEDIR ${CMAKE_INSTALL_DATAROOTDIR}/cmake/modules)
+ endif(NOT DUNE_INSTALL_MODULEDIR)
+endmacro(dune_project)
# create a new config.h file and overwrite the existing one
macro(dune_regenerate_config_cmake)
@@ -524,7 +543,17 @@ macro(dune_regenerate_config_cmake)
file(APPEND ${CONFIG_H_CMAKE_FILE} "${_file}")
endif(EXISTS ${_mod_conf_file})
endforeach()
+ # parse other modules dune.module file to generate variables for config.h
+ foreach(_dune_module_file ${${_dep}_PREFIX}/dune.module
+ ${${_dep}_PREFIX}/share/${_dep}/dune.module)
+ if(EXISTS ${_dune_module_file})
+ get_filename_component(_dune_module_file_path ${_dune_module_file} PATH)
+ dune_module_information(${_dune_module_file_path} QUIET)
+ endif(EXISTS ${_dune_module_file})
+ endforeach()
endforeach(_dep ${ALL_DEPENDENCIES})
+ # parse again dune.module file of current module to set PACKAGE_* variables
+ dune_module_information(${CMAKE_SOURCE_DIR} QUIET)
file(APPEND ${CONFIG_H_CMAKE_FILE} "\n${_myfile}")
endmacro(dune_regenerate_config_cmake)
@@ -579,7 +608,6 @@ macro(finalize_dune_project)
if(EXISTS ${CMAKE_SOURCE_DIR}/config.h.cmake)
install(FILES config.h.cmake DESTINATION share/${DUNE_MOD_NAME})
endif(EXISTS ${CMAKE_SOURCE_DIR}/config.h.cmake)
- export(PACKAGE ${DUNE_MOD_NAME})
if("${ARGC}" EQUAL "1")
message(STATUS "Adding custom target for config.h generation")
@@ -635,8 +663,8 @@ function(dune_expand_object_libraries _SOURCES_var _ADD_LIBS_var _COMPILE_FLAGS_
if(_matched)
string(REGEX REPLACE "${_regex}" "\\1" _basename "${_source}")
foreach(var _SOURCES _ADD_LIBS _COMPILE_FLAGS)
- get_property(_prop GLOBAL PROPERTY DUNE_LIB_${_basename}${var})
- list(APPEND _new${var} "${_prop}")
+ get_property(_prop GLOBAL PROPERTY DUNE_LIB_${_basename}${var})
+ list(APPEND _new${var} "${_prop}")
endforeach(var _SOURCES _ADD_LIBS _COMPILE_FLAGS)
else(_matched)
list(APPEND _new_SOURCES "${_source}")
@@ -657,27 +685,27 @@ macro(dune_add_library basename)
if(DUNE_LIB_OBJECT)
if(DUNE_LIB_${basename}_SOURCES)
message(FATAL_ERROR "There is already a library with the name ${basename}, "
- "but only one is allowed!")
+ "but only one is allowed!")
else(DUNE_LIB_${basename}_SOURCES)
foreach(source ${DUNE_LIB_UNPARSED_ARGUMENTS})
- list(APPEND full_path_sources ${CMAKE_CURRENT_SOURCE_DIR}/${source})
+ list(APPEND full_path_sources ${CMAKE_CURRENT_SOURCE_DIR}/${source})
endforeach(source ${DUNE_LIB_UNPARSED_ARGUMENTS})
# register sources, libs and flags for building the library later
define_property(GLOBAL PROPERTY DUNE_LIB_${basename}_SOURCES
- BRIEF_DOCS "Convenience property with sources for library ${basename}. DO NOT EDIT!"
- FULL_DOCS "Convenience property with sources for library ${basename}. DO NOT EDIT!")
+ BRIEF_DOCS "Convenience property with sources for library ${basename}. DO NOT EDIT!"
+ FULL_DOCS "Convenience property with sources for library ${basename}. DO NOT EDIT!")
set_property(GLOBAL PROPERTY DUNE_LIB_${basename}_SOURCES
- "${full_path_sources}")
+ "${full_path_sources}")
define_property(GLOBAL PROPERTY DUNE_LIB_${basename}_ADD_LIBS
- BRIEF_DOCS "Convenience property with libraries for library ${basename}. DO NOT EDIT!"
- FULL_DOCS "Convenience property with libraries for library ${basename}. DO NOT EDIT!")
+ BRIEF_DOCS "Convenience property with libraries for library ${basename}. DO NOT EDIT!"
+ FULL_DOCS "Convenience property with libraries for library ${basename}. DO NOT EDIT!")
set_property(GLOBAL PROPERTY DUNE_LIB_${basename}_ADD_LIBS
- "${DUNE_LIB_ADD_LIBS}")
+ "${DUNE_LIB_ADD_LIBS}")
define_property(GLOBAL PROPERTY DUNE_LIB_${basename}_COMPILE_FLAGS
- BRIEF_DOCS "Convenience property with compile flags for library ${basename}. DO NOT EDIT!"
- FULL_DOCS "Convenience property with compile flags for library ${basename}. DO NOT EDIT!")
+ BRIEF_DOCS "Convenience property with compile flags for library ${basename}. DO NOT EDIT!"
+ FULL_DOCS "Convenience property with compile flags for library ${basename}. DO NOT EDIT!")
set_property(GLOBAL PROPERTY DUNE_LIB_${basename}_COMPILE_FLAGS
- "${DUNE_LIB_COMPILE_FLAGS}")
+ "${DUNE_LIB_COMPILE_FLAGS}")
endif(DUNE_LIB_${basename}_SOURCES)
else(DUNE_LIB_OBJECT)
list(APPEND DUNE_LIB_SOURCES ${DUNE_LIB_UNPARSED_ARGUMENTS})
@@ -690,7 +718,7 @@ macro(dune_add_library basename)
endif(DUNE_LIB_ADD_LIBS)
if(DUNE_LIB_COMPILE_FLAGS)
setproperty(${basename} APPEND_STRING COMPILE_FLAGS
- "${DUNE_LIB_COMPILE_FLAGS}")
+ "${DUNE_LIB_COMPILE_FLAGS}")
endif(DUNE_LIB_COMPILE_FLAGS)
# Build library in ${PROJECT_BINARY_DIR}/lib
set_target_properties(${basename} PROPERTIES
@@ -701,55 +729,55 @@ macro(dune_add_library basename)
if(DUNE_BUILD_BOTH_LIBS)
if(BUILD_SHARED_LIBS)
- #create static lib
- add_library(${basename}-static STATIC ${DUNE_LIB_SOURCES})
- # make sure both libs have the same name.
- set_target_properties(${basename}-static PROPERTIES
+ #create static lib
+ add_library(${basename}-static STATIC ${DUNE_LIB_SOURCES})
+ # make sure both libs have the same name.
+ set_target_properties(${basename}-static PROPERTIES
OUTPUT_NAME ${basename}
ARCHIVE_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/lib")
- list(APPEND _created_libs ${basename}-static)
- # link with specified libraries.
- if(DUNE_LIB_ADD_LIBS)
- dune_target_link_libraries(${basename}-static ${DUNE_LIB_ADD_LIBS})
- endif(DUNE_LIB_ADD_LIBS)
- if(DUNE_LIB_COMPILE_FLAGS)
- setproperty(${basename}-static APPEND_STRING COMPILE_FLAGS
- "${DUNE_LIB_COMPILE_FLAGS}")
- endif(DUNE_LIB_COMPILE_FLAGS)
+ list(APPEND _created_libs ${basename}-static)
+ # link with specified libraries.
+ if(DUNE_LIB_ADD_LIBS)
+ dune_target_link_libraries(${basename}-static ${DUNE_LIB_ADD_LIBS})
+ endif(DUNE_LIB_ADD_LIBS)
+ if(DUNE_LIB_COMPILE_FLAGS)
+ setproperty(${basename}-static APPEND_STRING COMPILE_FLAGS
+ "${DUNE_LIB_COMPILE_FLAGS}")
+ endif(DUNE_LIB_COMPILE_FLAGS)
else(BUILD_SHARED_LIBS)
- #create shared libs
- add_library(${basename}-shared SHARED ${DUNE_LIB_SOURCES})
- set_target_properties(${basename}-shared PROPERTIES
+ #create shared libs
+ add_library(${basename}-shared SHARED ${DUNE_LIB_SOURCES})
+ set_target_properties(${basename}-shared PROPERTIES
OUTPUT_NAME ${basename}
LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/lib")
- # link with specified libraries.
- if(DUNE_LIB_ADD_LIBS)
- dune_target_link_libraries(${basename}-shared ${DUNE_LIB_ADD_LIBS})
- endif(DUNE_LIB_ADD_LIBS)
- if(DUNE_LIB_COMPILE_FLAGS)
- setproperty(${basename}-shared APPEND_STRING COMPILE_FLAGS
- "${DUNE_LIB_COMPILE_FLAGS}")
- endif(DUNE_LIB_COMPILE_FLAGS)
- list(APPEND _created_libs ${basename}-shared)
+ # link with specified libraries.
+ if(DUNE_LIB_ADD_LIBS)
+ dune_target_link_libraries(${basename}-shared ${DUNE_LIB_ADD_LIBS})
+ endif(DUNE_LIB_ADD_LIBS)
+ if(DUNE_LIB_COMPILE_FLAGS)
+ setproperty(${basename}-shared APPEND_STRING COMPILE_FLAGS
+ "${DUNE_LIB_COMPILE_FLAGS}")
+ endif(DUNE_LIB_COMPILE_FLAGS)
+ list(APPEND _created_libs ${basename}-shared)
endif(BUILD_SHARED_LIBS)
endif(DUNE_BUILD_BOTH_LIBS)
if(NOT DUNE_LIB_NO_EXPORT)
if(NOT _MODULE_EXPORT_USED)
- set(_MODULE_EXPORT_USED ON)
- set(_append "")
+ set(_MODULE_EXPORT_USED ON)
+ set(_append "")
else(NOT _MODULE_EXPORT_USED)
- set(_append APPEND)
+ set(_append APPEND)
endif(NOT _MODULE_EXPORT_USED)
# install targets to use the libraries in other modules.
install(TARGETS ${_created_libs}
- EXPORT ${DUNE_MOD_NAME}-targets DESTINATION lib)
+ EXPORT ${DUNE_MOD_NAME}-targets DESTINATION lib)
install(EXPORT ${DUNE_MOD_NAME}-targets
- DESTINATION lib/cmake)
+ DESTINATION lib/cmake)
# export libraries for use in build tree
export(TARGETS ${_created_libs} ${_append}
- FILE ${PROJECT_BINARY_DIR}/${DUNE_MOD_NAME}-targets.cmake)
+ FILE ${PROJECT_BINARY_DIR}/${DUNE_MOD_NAME}-targets.cmake)
endif(NOT DUNE_LIB_NO_EXPORT)
endif(DUNE_LIB_OBJECT)
endmacro(dune_add_library basename sources)
@@ -771,20 +799,20 @@ macro(replace_properties_for_one)
foreach(prop ${properties})
set(matched FALSE)
foreach(i RANGE 0 ${hlength})
- math(EXPR regexi "2 * ${i}")
- math(EXPR repli "${regexi} +1")
- list(GET REPLACE_UNPARSED_ARGUMENTS ${regexi} regex)
- list(GET REPLACE_UNPARSED_ARGUMENTS ${repli} replacement)
- string(REGEX MATCH ${regex} match ${prop})
-
- if(match)
- list(APPEND new_props ${replacement})
- set(matched TRUE)
- endif(match)
+ math(EXPR regexi "2 * ${i}")
+ math(EXPR repli "${regexi} +1")
+ list(GET REPLACE_UNPARSED_ARGUMENTS ${regexi} regex)
+ list(GET REPLACE_UNPARSED_ARGUMENTS ${repli} replacement)
+ string(REGEX MATCH ${regex} match ${prop})
+
+ if(match)
+ list(APPEND new_props ${replacement})
+ set(matched TRUE)
+ endif(match)
endforeach(i RANGE 0 ${hlength})
if(NOT matched)
- list(APPEND new_props ${prop})
+ list(APPEND new_props ${prop})
endif(NOT matched)
endforeach(prop ${properties})
list(REMOVE_DUPLICATES new_props)
@@ -859,7 +887,7 @@ function(replace_properties)
list(LENGTH REPLACE_UNPARSED_ARGUMENTS length)
# if(NOT (REPLACE_GLOBAL AND REPLACE_TARGET AND
-# REPLACE_SOURCE AND REPLACE
+# REPLACE_SOURCE AND REPLACE
math(EXPR mlength "${length} % 2 ")
math(EXPR hlength "${length} / 2 - 1")
diff --git a/cmake/modules/DunePkgConfig.cmake b/cmake/modules/DunePkgConfig.cmake
index 20197e932fc1ba42243e735f041be71d6d0930d4..0b6e3fa87b032c3c710e30a92c82159e8b7164f5 100644
--- a/cmake/modules/DunePkgConfig.cmake
+++ b/cmake/modules/DunePkgConfig.cmake
@@ -15,7 +15,18 @@ set(VERSION ${DUNE_MOD_VERSION})
set(CC ${CMAKE_C_COMPILER})
set(CXX "${CMAKE_CXX_COMPILER} ${CXX_STD11_FLAGS}")
-set(REQUIRES ${DUNE_DEPENDS})
+if(DUNE_DEPENDS)
+ foreach(_DUNE_DEPEND ${DUNE_DEPENDS})
+ string(REGEX REPLACE "\\(" "" REQF1 ${_DUNE_DEPEND})
+ string(REGEX REPLACE "\\)" "" LR ${REQF1})
+ if(REQUIRES)
+ set(REQUIRES "${REQUIRES} ${LR}")
+ else()
+ set(REQUIRES ${LR})
+ endif(REQUIRES)
+ endforeach(_DUNE_DEPEND ${DUNE_DEPENDS})
+endif(DUNE_DEPENDS)
+
#create pkg-config file
configure_file(
${PROJECT_SOURCE_DIR}/${DUNE_MOD_NAME}.pc.in
@@ -24,7 +35,7 @@ configure_file(
)
# install pkgconfig file
-if(PKG_CONFIG_FOUND )
+if(PKG_CONFIG_FOUND)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DUNE_MOD_NAME}.pc
DESTINATION lib/pkgconfig)
endif(PKG_CONFIG_FOUND)
diff --git a/cmake/modules/FindCXX11Conditional.cmake b/cmake/modules/FindCXX11Conditional.cmake
new file mode 100644
index 0000000000000000000000000000000000000000..6c85ca65ed3d01b1b6f558dcd4e077a57f3a9239
--- /dev/null
+++ b/cmake/modules/FindCXX11Conditional.cmake
@@ -0,0 +1,17 @@
+# Module that checks whether the compiler supports
+# C++11 std::conditional.
+#
+# Sets the following variable:
+# HAVE_STD_CONDITIONAL
+#
+# perform tests
+include(CheckCXXSourceCompiles)
+
+check_cxx_source_compiles("
+
+ #include <type_traits>
+
+ int main(void){
+ return std::conditional<true,std::integral_constant<int,0>,void>::type::value;
+ }"
+ HAVE_STD_CONDITIONAL)
diff --git a/cmake/modules/FindCXX11Features.cmake b/cmake/modules/FindCXX11Features.cmake
index 67fd5759f7c317553fd0e610b484c95019f7697c..fbb96ce4e53162fb37ee12ebcfc5fb24493d43ec 100644
--- a/cmake/modules/FindCXX11Features.cmake
+++ b/cmake/modules/FindCXX11Features.cmake
@@ -121,17 +121,6 @@ CHECK_CXX_SOURCE_COMPILES("
endif(NOT DISABLE_TR1_HEADERS)
-# __attribute__((always_inline))
-CHECK_CXX_SOURCE_COMPILES("
- void __attribute__((always_inline)) foo(void) {}
- int main(void)
- {
- foo();
- return 0;
- };
-" HAVE_ATTRIBUTE_ALWAYS_INLINE
-)
-
# __attribute__((unused))
CHECK_CXX_SOURCE_COMPILES("
int main(void)
diff --git a/cmake/modules/FindMProtect.cmake b/cmake/modules/FindMProtect.cmake
index e4afe68f82b1328165b1a1b54177c542d479d936..955ae1abd259a7d93ac92e4073dbb51874350212 100644
--- a/cmake/modules/FindMProtect.cmake
+++ b/cmake/modules/FindMProtect.cmake
@@ -5,11 +5,9 @@
# HAVE_SYS_MMAN_H
# HAVE_MPROTECT
check_include_file("sys/mman.h" HAVE_SYS_MMAN_H)
-message(STATUS HAVE_SYS_MMAN_H=${HAVE_SYS_MMAN_H})
include(CheckCSourceCompiles)
check_c_source_compiles("
#include <sys/mman.h>
int main(void){
mprotect(0,0,PROT_NONE);
}" HAVE_MPROTECT)
-message(STATUS HAVE_MPROTECT=${HAVE_MPROTECT})
diff --git a/cmake/modules/Makefile.am b/cmake/modules/Makefile.am
index 04631b7ddae96c54891037b9e56207a31e14888a..7870a68fa51c92b0a58212bdc6125d7dbf52ceee 100644
--- a/cmake/modules/Makefile.am
+++ b/cmake/modules/Makefile.am
@@ -10,6 +10,7 @@ MODULES = DuneBoost.cmake \
DuneTestMacros.cmake \
DuneTests.cmake \
FindBoostFusion.cmake \
+ FindCXX11Conditional.cmake \
FindCXX11Features.cmake \
FindGMP.cmake \
FindInkscape.cmake \
diff --git a/cmake/scripts/BuildTests.cmake.in b/cmake/scripts/BuildTests.cmake.in
index c2aadf7ab12745790f001bb59ae6a9d4eb73829f..fe1045641c68fa6864d73f086bec2aed1d87cb36 100644
--- a/cmake/scripts/BuildTests.cmake.in
+++ b/cmake/scripts/BuildTests.cmake.in
@@ -1,12 +1,9 @@
MACRO(get_directory_test_target _target _dir)
- message("$_dir")
string(REPLACE "@CMAKE_BINARY_DIR@" "" _relative_dir "${_dir}")
- message("$_relative_dir")
string(REPLACE "/" "_" ${_target} "${_relative_dir}")
- message("target=${${_target}}")
ENDMACRO(get_directory_test_target _target _dir)
get_directory_test_target(_build_test_target "@CMAKE_CURRENT_BINARY_DIR@")
message("binary_dir=@CMAKE_CURRENT_BINARY_DIR@")
execute_process(COMMAND @CMAKE_COMMAND@ --build @CMAKE_BINARY_DIR@
- --target ${_build_test_target})
\ No newline at end of file
+ --target ${_build_test_target})
diff --git a/config.h.cmake b/config.h.cmake
index c145e3ae4a4edfe7f3579bebbe1fbd214b413fdf..af32e048e87c7fa5f694b68ff0808a918bf0103e 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -10,10 +10,6 @@
#warning deprecation warning in that case.
#endif
-/* If this is set, the member 'size' of FieldVector is a method rather than an
- enum */
-#define DUNE_COMMON_FIELDVECTOR_SIZE_IS_METHOD 1
-
/* Define to the version of dune-common */
#define DUNE_COMMON_VERSION "${DUNE_COMMON_VERSION}"
@@ -112,6 +108,9 @@
/* Define to 1 if you have the <type_traits> header file. */
#cmakedefine HAVE_TYPE_TRAITS 1
+/* Define to 1 if you have the <type_traits> header file. */
+#cmakedefine HAVE_STD_CONDITIONAL 1
+
/* Define to 1 if the MPI2 Standard is supported */
#cmakedefine MPI_2 1
diff --git a/doc/doxygen/Doxystyle b/doc/doxygen/Doxystyle
index a328695659ab94d11186cb6a6365c586619eac75..c29eb5633a4c3aadbb6260d8f3cc848797b7b1e3 100644
--- a/doc/doxygen/Doxystyle
+++ b/doc/doxygen/Doxystyle
@@ -107,8 +107,6 @@ INTERNAL_DOCS = YES
# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy
# in the documentation. The default is NO.
-SHOW_DIRECTORIES = YES
-
REFERENCED_BY_RELATION = YES
REFERENCES_RELATION = YES
ALPHABETICAL_INDEX = YES
@@ -207,7 +205,6 @@ GENERATE_BUGLIST = YES
GENERATE_DEPRECATEDLIST= YES
ENABLED_SECTIONS =
MAX_INITIALIZER_LINES = 30
-SHOW_DIRECTORIES = YES
SHOW_FILES = YES
SHOW_NAMESPACES = YES
FILE_VERSION_FILTER =
diff --git a/dune/common/Makefile.am b/dune/common/Makefile.am
index 51bdd376ef9587ef48332e7948fa48ac57337ff8..2897c989451651ed1108c4cb9bfa3dca65b7c6dc 100644
--- a/dune/common/Makefile.am
+++ b/dune/common/Makefile.am
@@ -7,8 +7,8 @@ noinst_LTLIBRARIES = libcommon.la
libcommon_la_SOURCES = \
debugallocator.cc \
- fmatrixev.cc \
- dynmatrixev.cc \
+ fmatrixev.cc \
+ dynmatrixev.cc \
ios_state.cc \
parametertree.cc \
parametertreeparser.cc \
@@ -60,9 +60,9 @@ commoninclude_HEADERS = \
iteratorfacades.hh \
lcm.hh \
lru.hh \
- mallocallocator.hh \
+ mallocallocator.hh \
math.hh \
- matvectraits.hh \
+ matvectraits.hh \
misc.hh \
mpicollectivecommunication.hh \
mpiguard.hh \
diff --git a/dune/common/densematrix.hh b/dune/common/densematrix.hh
index 27e73573e7bf4956b414afa9f5db22b54d783eb8..fa7383578e4a0e3e7f3e1d6ee2c589db4989ab27 100644
--- a/dune/common/densematrix.hh
+++ b/dune/common/densematrix.hh
@@ -867,7 +867,7 @@ namespace Dune
if (fvmeta::absreal((*this)[0][0])<FMatrixPrecision<>::absolute_limit())
DUNE_THROW(FMatrixError,"matrix is singular");
#endif
- (*this)[0][0] = 1.0/(*this)[0][0];
+ (*this)[0][0] = field_type( 1 ) / (*this)[0][0];
}
else if (rows()==2) {
@@ -877,7 +877,7 @@ namespace Dune
if (fvmeta::absreal(detinv)<FMatrixPrecision<>::absolute_limit())
DUNE_THROW(FMatrixError,"matrix is singular");
#endif
- detinv = 1.0/detinv;
+ detinv = field_type( 1 ) / detinv;
field_type temp=(*this)[0][0];
(*this)[0][0] = (*this)[1][1]*detinv;
diff --git a/dune/common/lru.hh b/dune/common/lru.hh
index 8439596bb3f9a25480b50b78dddec928bd87999d..91ab8ed9406ed0f447c60da9d3b4cf5f60ed1948 100644
--- a/dune/common/lru.hh
+++ b/dune/common/lru.hh
@@ -7,6 +7,8 @@
#include <utility>
#include <map>
+#include <dune/common/exceptions.hh>
+
/** @file
@author Christian Engwer
@brief LRU Cache Container, using an STL like interface
@@ -37,7 +39,7 @@ namespace Dune {
/**
@brief LRU Cache Container
- Implementatation of an LRU (least recently used) cache
+ Implementation of an LRU (least recently used) cache
container. This implementation follows the approach presented in
http://aim.adc.rmit.edu.au/phd/sgreuter/papers/graphite2003.pdf
*/
@@ -145,7 +147,8 @@ namespace Dune {
/**
* @brief Insert a value into the container
*
- * Stores value under key and marks it as most recent.
+ * Stores value under key and marks it as most recent. If this key
+ * is already present, the associated data is replaced.
*
* @param key associated with data
* @param data to store
@@ -172,23 +175,26 @@ namespace Dune {
}
/**
- * @brief mark data associateed with key as most recent
+ * @brief mark data associated with key as most recent
*
* @return reference of stored data
*/
reference touch (const key_type & key)
{
/* query _index for iterator */
- iterator it = _index[key];
- /* update _data
+ map_iterator it = _index.find(key);
+ if (it == _index.end())
+ DUNE_THROW(Dune::RangeError,
+ "Failed to touch key " << key << ", it is not in the lru container");
+ /* update _data
move it to the front
*/
- _data.splice(_data.begin(), _data, it);
- return it->second;
+ _data.splice(_data.begin(), _data, it->second);
+ return it->second->second;
}
/**
- *
+ * @brief Retrieve number of entries in the container
*/
size_type size() const
{
@@ -196,7 +202,10 @@ namespace Dune {
}
/**
+ * @brief ensure a maximum size of the container
*
+ * If new_size is smaller than size the oldest elements are
+ * dropped. Otherwise nothing happens.
*/
void resize(size_type new_size)
{
diff --git a/dune/common/parallel/mpicollectivecommunication.hh b/dune/common/parallel/mpicollectivecommunication.hh
index 888f3fe2018e7347a6482c6d7c5745a0b2499a2d..5bdd6eca6e912748bcb23b289fd00d7c181fb980 100644
--- a/dune/common/parallel/mpicollectivecommunication.hh
+++ b/dune/common/parallel/mpicollectivecommunication.hh
@@ -249,8 +249,9 @@ namespace Dune
}
//! @copydoc CollectiveCommunication::gather()
+ //! @note out must have space for P*len elements
template<typename T>
- int gather (T* in, T* out, int len, int root) const // note out must have space for P*len elements
+ int gather (T* in, T* out, int len, int root) const
{
return MPI_Gather(in,len,MPITraits<T>::getType(),
out,len,MPITraits<T>::getType(),
@@ -258,8 +259,9 @@ namespace Dune
}
//! @copydoc CollectiveCommunication::scatter()
+ //! @note out must have space for P*len elements
template<typename T>
- int scatter (T* send, T* recv, int len, int root) const // note out must have space for P*len elements
+ int scatter (T* send, T* recv, int len, int root) const
{
return MPI_Scatter(send,len,MPITraits<T>::getType(),
recv,len,MPITraits<T>::getType(),
diff --git a/dune/common/test/.gitignore b/dune/common/test/.gitignore
index 8ebde22bd0128505ce45f356a7fe2e3238b5ef43..a61e60ee5dd4af0287f42c06fbeb2a5b71e7326a 100644
--- a/dune/common/test/.gitignore
+++ b/dune/common/test/.gitignore
@@ -70,4 +70,5 @@ testdebugallocator_fail3
testdebugallocator_fail4
testdebugallocator_fail5
eigenvaluestest
-
+*.log
+*.trs
diff --git a/dune/common/test/Makefile.am b/dune/common/test/Makefile.am
index 30aaefacad809bf48b58b81549044d3ff53fb713..5d347f0305f1dcc903c1e8b841622d824fa785cf 100644
--- a/dune/common/test/Makefile.am
+++ b/dune/common/test/Makefile.am
@@ -98,7 +98,7 @@ XFAIL_TESTS = \
# programs just to build when "make check" is used
check_PROGRAMS = $(TESTPROGS)
-noinst_HEADERS = dummyiterator.hh
+noinst_HEADERS = dummyiterator.hh iteratorfacadetest.hh
# Install some test headers, because they get used by tests in other modules
testincludedir = $(includedir)/dune/common/test
@@ -268,7 +268,7 @@ testfconstruct_fail2_CPPFLAGS = $(AM_CPPFLAGS) -DFVSIZE=5
conversiontest_SOURCES = conversiontest.cc
-sourcescheck_NOSOURCES = exprtmpl.cc timing.cc
+sourcescheck_NOSOURCES = timing.cc
testfloatcmp_SOURCES = testfloatcmp.cc
diff --git a/dune/common/test/conversiontest.cc b/dune/common/test/conversiontest.cc
index 76d15cf98f77888b231ff858ca77a67650255018..b87b4b00edb21ebc13fca5a5d2c271ccb3a10f7d 100644
--- a/dune/common/test/conversiontest.cc
+++ b/dune/common/test/conversiontest.cc
@@ -1,5 +1,9 @@
// -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
// vi: set et ts=4 sw=2 sts=2:
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include <iostream>
#include <dune/common/typetraits.hh>
diff --git a/dune/common/test/eigenvaluestest.cc b/dune/common/test/eigenvaluestest.cc
index dea8906f6395eb8a0d695c5e195818d0bb96066e..64812d135fd472c783eeeef79540a2bde3069e50 100644
--- a/dune/common/test/eigenvaluestest.cc
+++ b/dune/common/test/eigenvaluestest.cc
@@ -1,15 +1,15 @@
// -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
// vi: set et ts=4 sw=2 sts=2:
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
//==============================================================================
//!
-//! \file shapefunctions.hpp
-//!
//! \date Nov 9 2011
//!
//! \author Arne Morten Kvarving / SINTEF
//!
-//! \brief Classes for shape functions. Loosely based on code in dune-grid-howto
-//!
//==============================================================================
#include <dune/common/fvector.hh>
diff --git a/dune/common/test/exprtmpl.cc b/dune/common/test/exprtmpl.cc
deleted file mode 100644
index 4e57f196eebb4be75798c07d3bd3dfc25cb36f38..0000000000000000000000000000000000000000
--- a/dune/common/test/exprtmpl.cc
+++ /dev/null
@@ -1,333 +0,0 @@
-// -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-// vi: set et ts=4 sw=2 sts=2:
-/*
- TODO:
- - test deeper Matrix nesting
- - get rid of
- int *M;
- - fix RowBlock::N()
- - remove second template parameter of FlatColIterator
- - vectorentry -> exrpressionentry
- - FlatColIterator<Matrix> does not work if Matrix is mutable
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <iostream>
-#include <fstream>
-#include <dune/common/fvector.hh>
-#include <dune/common/timer.hh>
-//#include <dune/istl/bvector.hh>
-//#include <dune/istl/io.hh>
-#include <dune/common/iteratorfacades.hh>
-
-Indent INDENT;
-
-void test_fvector()
-{
- typedef Dune::FieldVector<double,2> VB;
- VB v1(1);
- VB v2(2);
-
- typedef Dune::ExprTmpl::ConstRef<VB> RVB;
- VB v = 0.5 * (v1 + v2 * 2) + 3 * v1 - v2;
- std::cout << " 0.5 * ( " << v1 << " + " << v2 << " * 2) + 3 * " << v1 << " - " << v2 << std::endl;
-}
-
-void test_blockvector()
-{
- Dune::FieldVector<double,2> v(10);
- typedef Dune::FieldVector<double,2> VB;
- typedef Dune::BlockVector<VB> BV;
-
- const int sz = 3;
- BV bv1(sz), bv2(sz);
- bv1 = 1;
- bv2 = 0;
- bv2[1][0]=1;
- bv2[1][1]=2;
-
- BV bv(sz);
- bv = -17;
- printvector (std::cout, bv, "bv", "r");
- // bv.emptyClone(bv1);
- std::cout << "Assingn from ConstRef\n";
- bv = 2 * (bv1 + bv2);
- bv -= 1;
-
- printvector (std::cout, bv1, "bv1", "r");
- printvector (std::cout, bv2, "bv2", "r");
- printvector (std::cout, bv, "bv", "r");
-
-}
-
-void test_blockblockvector()
-{
- const int bs = 2;
- const int sz = 3;
- typedef Dune::FieldVector<double,bs> VB;
- typedef Dune::BlockVector<VB> BV;
- typedef Dune::BlockVector<BV> BBV;
- typedef Dune::ExprTmpl::ConstRef<BV> RBV;
- BV bv1(sz), bv2(sz);
- bv1 = 1;
- bv2 = 0;
- bv2[1][0]=1;
- bv2[1][1]=2;
-
- Dune::ExprTmpl::ConstRef<BV> rbv1(bv1);
- Dune::ExprTmpl::ConstRef<BV> rbv2(bv2);
-
- BBV bbv(2);
- bbv[0].resize(bv1.N());
- bbv[0] = Dune::ExprTmpl::Expression<RBV>(rbv1);
- bbv[1].resize(bv2.N());
- bbv[1] = Dune::ExprTmpl::Expression<RBV>(rbv2);
-
- Dune::Timer stopwatch;
- stopwatch.reset();
- for (int i=0; i<10; i++) bbv *= 2;
- std::cout << "Time bbv*2: " << stopwatch.elapsed() << std::endl;
-#ifndef NOPRINT
- // Dune::FlatIterator<BBV> fit(bbv.begin());
- // Dune::FlatIterator<BBV> fend(bbv.end());
- // int index = 0;
- // for(;fit!=fend;++fit)
- // {
- // BBV::field_type x;
- // x = *fit;
- // std::cout << index << "\t" << x << std::endl;
- // index++;
- // }
- printvector (std::cout, bv1, "bv1", "r");
- printvector (std::cout, bv2, "bv1", "r");
- printvector (std::cout, bbv, "bbv", "r");
-#endif
- std::cout << "infinity_norm(bbv)=" << infinity_norm(bbv) << std::endl;
- std::cout << "two_norm(bbv)=" << two_norm(bbv) << std::endl;
- std::cout << "bbv.two_norm()=" << bbv.two_norm() << std::endl;
- std::cout << "two_norm2(bbv)=" << two_norm2(bbv) << std::endl;
- std::cout << "one_norm(bbv)=" << one_norm(bbv) << std::endl;
-}
-
-// namespace Dune {
-
-// namespace ExprTmpl {
-
-// template <class K, int iN, int iM>
-// class MatrixMulVector< FieldMatrix<K,iN,iM>,
-// BCRSMatrix< FieldMatrix<K,iN,iM> >,
-// BlockVector< FieldVector<K,iM> > >
-// {
-// public:
-// typedef BCRSMatrix< FieldMatrix<K,iN,iM> > Mat;
-// typedef BlockVector< FieldVector<K,iM> > Vec;
-// typedef typename
-// BlockTypeN<MatrixMulVector<Mat,Mat,Vec>,
-// MyDepth<FieldMatrix<K,iN,iM>,Mat>::value-1>::type
-// ParentBlockType;
-// /* constructor */
-// MatrixMulVector(const Mat & _A, const Vec & _v, int* _DUNE_TEST_M,
-// const ParentBlockType & _parent) :
-// parent(_parent), M(_DUNE_TEST_M), A(_A), v(_v )
-// {
-// int parent_i = M[0];
-// typename Mat::ConstColIterator it = A[parent_i].begin();
-// typename Mat::ConstColIterator end = A[parent_i].end();
-// tmp = 0;
-// for (; it!=end; ++it)
-// {
-// it->umv(tmp,v[it.index()]);
-// }
-// };
-// K operator[] (int i) const {
-// return tmp[i];
-// }
-// int N() const { iN; };
-// const ParentBlockType & parent;
-// private:
-// FieldVector<K,iN> tmp;
-// mutable int* M;
-// const Mat & A;
-// const Vec & v;
-// };
-
-// } // NS ExpreTmpl
-
-// } // NS Dune
-
-//template<int BlockSize, int N, int M>
-template<int BN, int BM, int N, int M>
-void test_matrix()
-{
- std::cout << "test_matrix<" << BN << ", " << BM << ", "
- << N << ", " << M << ">\n";
-
- typedef double matvec_t;
- typedef Dune::FieldVector<matvec_t,BN> LVB;
- typedef Dune::FieldVector<matvec_t,BM> VB;
- typedef Dune::FieldMatrix<matvec_t,BN,BM> MB;
- typedef Dune::BlockVector<LVB> LeftVector;
- typedef Dune::BlockVector<VB> Vector;
- typedef Dune::BCRSMatrix<MB> Matrix;
-
- LVB a(0);
- VB b(2);
- MB _DUNE_TEST_M(1);
- _DUNE_TEST_M[1][1] = 3;
-
- // a += M * b
- _DUNE_TEST_M.umv(b,a);
-
-#ifndef NOPRINT
- printmatrix (std::cout, _DUNE_TEST_M, "Matrix", "r");
- printvector (std::cout, a, "Vector", "r");
-#endif
-
- // a = M * b
-#if 0
- a = _DUNE_TEST_M*b;
-#endif
-
-#ifndef NOPRINT
- printvector (std::cout, a, "Vector", "r");
-#endif
-
- Matrix A(N,M,Matrix::row_wise);
- typename Matrix::CreateIterator i=A.createbegin();
- typename Matrix::CreateIterator end=A.createend();
- std::cout << "Building matrix structure\n";
- // build up the matrix structure
- int c=0;
- for (; i!=end; ++i)
- {
- // insert a non zero entry for myself
- i.insert(c);
- // insert index M-1
- i.insert(M-1);
- c++;
- }
- std::cout << "...done\n";
-
-#ifndef NOPRINT
- std::cout << "Matrix coldim=" << A.coldim() << std::endl;
- std::cout << "Matrix rowdim=" << A.rowdim() << std::endl;
- std::cout << "Matrix N=" << A.M() << std::endl;
- std::cout << "Matrix M=" << A.N() << std::endl;
-
- std::cout << "Assembling matrix\n";
- typename Matrix::Iterator rit=A.begin();
- typename Matrix::Iterator rend=A.end();
- for (; rit!=rend; ++rit)
- {
- typename Matrix::ColIterator cit=rit->begin();
- typename Matrix::ColIterator cend=rit->end();
- for (; cit!=cend; ++cit)
- {
- // *rit = rit.index();
- *cit = 10*cit.index()+rit.index();
- }
- }
- std::cout << "...done\n";
-
- printmatrix (std::cout, A, "Matrix", "r");
-#endif
-
- LeftVector v(N);
- LeftVector v2(N);
- v = 0;
- Vector x(M);
- x = 1;
- Dune::FlatIterator<Vector> fit = x.begin();
- Dune::FlatIterator<Vector> fend = x.end();
- c = 0;
- for (; fit!=fend; ++fit)
- *fit=c++;
-
- Dune::Timer stopwatch;
- stopwatch.reset();
- A.umv(x,v);
- std::cout << "Time umv: " << stopwatch.elapsed() << std::endl;
-
- using namespace Dune;
-#ifndef NOPRINT
- printvector (std::cout, x, "Vector X", "r");
- printvector (std::cout, v, "Vector", "r");
-#endif
-
- v2 = 0;
- stopwatch.reset();
- v2 += A * x;
- std::cout << "Time v2+=A*x: " << stopwatch.elapsed() << std::endl;
-#ifndef NOPRINT
- printvector (std::cout, v2, "Vector2", "r");
-#endif
-
-#ifndef NOPRINT
- // int rowIndex[]={1};
- // FlatColIterator<const Matrix> it(A[2].begin(),rowIndex);
- // for (int i=0; i<5; i++)
- // {
- // std::cout << *it << " ";
- // ++it;
- // }
- // std::cout << std::endl;
-#endif
- std::cout << std::endl;
-}
-
-void test_norm()
-{
- Dune::FieldVector<double,3> a,b;
- double c;
- c = (a-b).two_norm();
- c = two_norm(a-b);
-}
-
-void test_sproduct()
-{
- Dune::FieldVector<double,2> v(10);
- typedef Dune::FieldVector<double,2> VB;
- typedef Dune::BlockVector<VB> BV;
-
- const int sz = 3;
- BV bv1(sz), bv2(sz);
- bv1 = 1;
- bv2 = 0;
- bv2[1][0]=1;
- bv2[1][1]=2;
-
- double x;
- x = bv1[0] * bv2[0];
- x = bv1 * bv2;
-}
-
-int main()
-{
- // Dune::dvverb.attach(std::cout);
- try
- {
- // test_fvector();
- // test_blockvector();
- test_norm();
- test_sproduct();
- test_blockblockvector();
- test_matrix<2,3,3,4>();
-#ifdef NOPRINT
- test_matrix<3,6,400000,500000>();
- test_matrix<6,3,400000,500000>();
- test_matrix<30,60,4000,5000>();
- test_matrix<150,150,500,4000>();
- test_matrix<150,150,1000,2000>();
-#endif
- // test_matrix<150,150,2000,1000>(); // fails in fmeta_something
- // test_matrix<150,150,4000,500>(); // fails in fmeta_something
- }
- catch (Dune::Exception & e)
- {
- std::cout << e << std::endl;
- }
- return (0);
-}
diff --git a/dune/common/test/fmatrixtest.cc b/dune/common/test/fmatrixtest.cc
index 9689ca6678b8698d12a519535dd10830d60d26b4..2fb4389e0e20d0e803f0cacfdf7d3937c3a7ee28 100644
--- a/dune/common/test/fmatrixtest.cc
+++ b/dune/common/test/fmatrixtest.cc
@@ -581,6 +581,7 @@ int main()
test_determinant();
test_invert< float, 34 >();
test_invert< double, 34 >();
+ test_invert< std::complex< long double >, 2 >();
return test_invert_solve();
}
catch (Dune::Exception & e)
diff --git a/dune/common/test/tupleutilitytest.cc b/dune/common/test/tupleutilitytest.cc
index 65de1540f109aaf02db7621a71c6e7d0affdf44c..6ee3e4fdd5fb2cc4c9c2a73d0e5010b15e996cc9 100644
--- a/dune/common/test/tupleutilitytest.cc
+++ b/dune/common/test/tupleutilitytest.cc
@@ -99,7 +99,7 @@ struct DivisorAccumulator
typedef typename Data::second_type OldTuple;
typedef typename Dune::PushBackTuple<OldTuple, PotentialDivisor>::type ExtendedTuple;
- typedef typename Dune::SelectType<isDivisor, ExtendedTuple, OldTuple>::Type NewTuple;
+ typedef typename Dune::conditional<isDivisor, ExtendedTuple, OldTuple>::type NewTuple;
typedef typename std::pair<typename Data::first_type, NewTuple> type;
};
@@ -123,7 +123,7 @@ struct PrimeAccumulator
{
enum {isPrime = (Divisors<N::value>::value==2)};
- typedef typename Dune::SelectType<isPrime, typename Dune::PushBackTuple<Data, N>::type, Data>::Type type;
+ typedef typename Dune::conditional<isPrime, typename Dune::PushBackTuple<Data, N>::type, Data>::type type;
};
// Construct list primes
diff --git a/dune/common/tupleutility.hh b/dune/common/tupleutility.hh
index 42fe3540e27697086c83c348ad8fd3861b833a0d..9fd019de50faa3db38d753aaa5cc021cfe8bae2d 100644
--- a/dune/common/tupleutility.hh
+++ b/dune/common/tupleutility.hh
@@ -1133,8 +1133,8 @@ namespace Dune {
*
* \note Since transformTuple() takes non-const references to the extra
* arguments, it will only bind to lvalue extra arguments, unless you
- * specify the corresconding template parameter as \c const \c
- * SomeType. Specifically this meands that you cannot simply use
+ * specify the corresponding template parameter as \c const \c
+ * SomeType. Specifically this means that you cannot simply use
* literals or function return values as extra arguments. Providing
* overloads for all possible combinations of rvalue and lvalue extra
* arguments would result in \f$2^{n+1}-1\f$ overloads where \f$n\f$
@@ -1511,10 +1511,10 @@ namespace Dune {
template<class Tuple, template<class> class Predicate, std::size_t start = 0,
std::size_t size = tuple_size<Tuple>::value>
class FirstPredicateIndex :
- public SelectType<Predicate<typename tuple_element<start,
+ public conditional<Predicate<typename tuple_element<start,
Tuple>::type>::value,
integral_constant<std::size_t, start>,
- FirstPredicateIndex<Tuple, Predicate, start+1> >::Type
+ FirstPredicateIndex<Tuple, Predicate, start+1> >::type
{
dune_static_assert(tuple_size<Tuple>::value == size, "The \"size\" "
"template parameter of FirstPredicateIndex is an "
@@ -1572,17 +1572,6 @@ namespace Dune {
*
* \tparam Tuple The tuple type to extend
* \tparam T The type to be appended to the tuple
- *
- * With variadic templates the generic specialization would be:
- *
- * \code
- * template<class... TupleArgs, class T>
- * struct PushBackTuple<typename Dune::tuple<TupleArgs...>, T>
- * {
- * typedef typename Dune::tuple<TupleArgs..., T> type;
- * };
- * \endcode
- *
*/
template< class Tuple, class T>
struct PushBackTuple
@@ -1607,6 +1596,13 @@ namespace Dune {
#ifndef DOXYGEN
+#if HAVE_VARIADIC_TEMPLATES
+ template<class... TupleArgs, class T>
+ struct PushBackTuple<typename Dune::tuple<TupleArgs...>, T>
+ {
+ typedef typename Dune::tuple<TupleArgs..., T> type;
+ };
+#else
template<class T>
struct PushBackTuple< Dune::tuple<>, T>
{
@@ -1660,6 +1656,7 @@ namespace Dune {
{
typedef typename Dune::tuple<T1, T2, T3, T4, T5, T6, T7, T8, T> type;
};
+#endif // HAVE_VARIADIC_TEMPLATES
#endif
@@ -1670,17 +1667,6 @@ namespace Dune {
*
* \tparam Tuple The tuple type to extend
* \tparam T The type to be prepended to the tuple
- *
- * With variadic templates the generic specialization would be:
- *
- * \code
- * template<class... TupleArgs, class T>
- * struct PushFrontTuple<typename Dune::tuple<TupleArgs...>, T>
- * {
- * typedef typename Dune::tuple<T, TupleArgs...> type;
- * };
- * \endcode
- *
*/
template< class Tuple, class T>
struct PushFrontTuple
@@ -1705,6 +1691,13 @@ namespace Dune {
#ifndef DOXYGEN
+#if HAVE_VARIADIC_TEMPLATES
+ template<class... TupleArgs, class T>
+ struct PushFrontTuple<typename Dune::tuple<TupleArgs...>, T>
+ {
+ typedef typename Dune::tuple<T, TupleArgs...> type;
+ };
+#else
template<class T>
struct PushFrontTuple< Dune::tuple<>, T>
{
@@ -1758,6 +1751,7 @@ namespace Dune {
{
typedef typename Dune::tuple<T, T1, T2, T3, T4, T5, T6, T7, T8> type;
};
+#endif // HAVE_VARIADIC_TEMPLATES
#endif
diff --git a/dune/common/typetraits.hh b/dune/common/typetraits.hh
index 561086be632e88eb429b28b1cf6b5a4bb32deb35..4763ed9b5522effe7df36b52976126ea0cb48960 100644
--- a/dune/common/typetraits.hh
+++ b/dune/common/typetraits.hh
@@ -9,6 +9,8 @@
#include <tr1/type_traits>
#endif
+#include <dune/common/deprecated.hh>
+
namespace Dune
{
@@ -370,8 +372,10 @@ namespace Dune
*
* If template parameter first is true T1 is selected
* otherwise T2 will be selected.
- * The selected type id accessible through the typedef
+ * The selected type is accessible through the typedef
* Type.
+ *
+ * \deprecated Will be removed after dune-common-2.3, use 'conditional' instead.
*/
template<bool first, class T1, class T2>
struct SelectType
@@ -382,15 +386,53 @@ namespace Dune
* if first is true this will be type T1 and
* otherwise T2
*/
- typedef T1 Type;
- };
+ typedef T1 Type DUNE_DEPRECATED_MSG("Use Dune::conditional::type instead");
+ } DUNE_DEPRECATED;
template<class T1, class T2>
struct SelectType<false,T1,T2>
{
- typedef T2 Type;
+ typedef T2 Type DUNE_DEPRECATED_MSG("Use Dune::conditional::type instead");
};
+#if DOXYGEN || !HAVE_STD_CONDITIONAL
+
+ /**
+ * @brief Select a type based on a condition.
+ *
+ * If template parameter first is true T1 is selected
+ * otherwise T2 will be selected.
+ * The selected type is accessible through the typedef
+ * type.
+ *
+ * \note If available, this uses C++11 std::conditional, otherwise it provides
+ * a reimplementation.
+ */
+ template<bool first, class T1, class T2>
+ struct conditional
+ {
+ /**
+ * @brief The selected type
+ *
+ * if first is true this will be type T1 and
+ * T2 otherwise
+ */
+ typedef T1 type;
+ };
+
+ template<class T1, class T2>
+ struct conditional<false,T1,T2>
+ {
+ typedef T2 type;
+ };
+
+#else // DOXYGEN || !HAVE_STD_CONDITONAL
+
+ // pull in default implementation
+ using std::conditional;
+
+#endif // DOXYGEN || !HAVE_STD_CONDITONAL
+
////////////////////////////////////////////////////////////////////////
//
// integral_constant (C++0x 20.7.3 "Helper classes")
diff --git a/lib/dunecommonam2cmake.lib b/lib/dunecommonam2cmake.lib
index 654aa774fdf1c3654e5074e9d40bc939668b9bc4..e28682e39e2c770b0737587b2640087f9b127faa 100644
--- a/lib/dunecommonam2cmake.lib
+++ b/lib/dunecommonam2cmake.lib
@@ -20,25 +20,31 @@ dune_common_options_am2cmake()
default_am2cmake_options $CMAKE_PACKAGES
# Check for --enable-parallel and otherwise deactivate MPI
- echo $PARAMS | grep \\-\\-enable-parallel
+ echo $PARAMS | grep \\-\\-enable-parallel > /dev/null
if test "$?" -ne 0 ; then
CMAKE_PARAMS="$CMAKE_PARAMS -DCMAKE_DISABLE_FIND_PACKAGE_MPI=TRUE"
fi
# Check for --disable-gxx0xcheck
- echo $PARAMS | grep \\-\\-disable-gxx0xcheck
+ echo $PARAMS | grep \\-\\-disable-gxx0xcheck > /dev/null
if test "$?" -eq 0 ; then
CMAKE_PARAMS="$CMAKE_PARAMS -DDISABLE_GXX0XCHECK:Bool=TRUE"
fi
# Check for --disable-gxx0xcheck
- echo $PARAMS | grep \\-\\-disable-tr1-headers
+ echo $PARAMS | grep \\-\\-disable-tr1-headers > /dev/null
if test "$?" -eq 0 ; then
CMAKE_PARAMS="$CMAKE_PARAMS -DDISABLE_TR1_HEADERS:Bool=TRUE"
fi
# Check for --with-minimal-debug-level
- local arg=`echo $PARAMS| sed "s/.*--with-minimal-debug-level=\(\S*\).*/\1/"`
+ local arg=`echo "$PARAMS"| sed "s/.*--with-minimal-debug-level=\(\S*\).*/\1/"`
if test "x$arg" != "x$PARAMS"; then
CMAKE_PARAMS="$CMAKE_PARAMS -DMINIMAL_DEBUG_LEVEL:String=$arg"
fi
+
+ #Check for --prefix
+ local arg=`echo "$PARAMS"| sed "s/.*--prefix=\(\S*\).*/\1/"`
+ if test "x$arg" != "x$PARAMS"; then
+ CMAKE_PARAMS="$CMAKE_PARAMS -DCMAKE_INSTALL_PREFIX=$arg"
+ fi
}
diff --git a/lib/dunemodules.lib b/lib/dunemodules.lib
index 59c84f897de8b03f8109d78112a26e8c573081cc..ce28c788190a608155783e9310622d947f0f7a6a 100644
--- a/lib/dunemodules.lib
+++ b/lib/dunemodules.lib
@@ -630,7 +630,7 @@ default_am2cmake_libraries(){
fi
export "$lowercase"-lib_processed=1
term="s/.*--with-""$lowercase""-lib=\(\S*\).*/\1/"
- arg=`echo $PARAMS | sed "$term"`
+ arg=`echo "$PARAMS" | sed "$term"`
if test "x$arg" != "x" && test "x$PARAMS" != "x$arg"; then
CMAKE_PARAMS="$CMAKE_PARAMS -D$uppercase""_LIBRARY=$arg"
fi
diff --git a/m4/CMakeLists.txt b/m4/CMakeLists.txt
index 5a842931e66674c4c53c92a75f81b363982c02fb..40c791eb1a29f6d3837fee16a753360a7a05ba01 100644
--- a/m4/CMakeLists.txt
+++ b/m4/CMakeLists.txt
@@ -13,6 +13,7 @@ install(PROGRAMS
cxx0x_static_assert.m4
cxx0x_variadic.m4
cxx0x_variadic_constructor_sfinae.m4
+ cxx11_conditional.m4
dune.m4
dune_all.m4
dune_autobuild.m4
diff --git a/m4/Makefile.am b/m4/Makefile.am
index 68a0b3f51e1ecc4bfaff302f2f02901b15854b47..32fbabbd59d89418cc3fe28357981e2308b74613 100644
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -17,6 +17,7 @@ ALLM4S = \
cxx0x_static_assert.m4 \
cxx0x_variadic.m4 \
cxx0x_variadic_constructor_sfinae.m4 \
+ cxx11_conditional.m4 \
dune.m4 \
dune_all.m4 \
dune_autobuild.m4 \
diff --git a/m4/cxx11_conditional.m4 b/m4/cxx11_conditional.m4
new file mode 100644
index 0000000000000000000000000000000000000000..8bbe0c874e30ffb9eb0d4afa7f245db44d297788
--- /dev/null
+++ b/m4/cxx11_conditional.m4
@@ -0,0 +1,25 @@
+# tests for C++11 conditional support
+# the associated macro is called HAVE_STD_CONDITIONAL
+
+AC_DEFUN([CXX11_CONDITIONAL_CHECK],[
+ AC_CACHE_CHECK([for C++11 std::conditional], dune_cv_cxx11_conditional_support, [
+ AC_REQUIRE([AC_PROG_CXX])
+ AC_REQUIRE([GXX0X])
+ AC_LANG_PUSH([C++])
+ AC_RUN_IFELSE([
+ AC_LANG_PROGRAM([
+
+ #include <type_traits>
+
+ ],
+ [
+ return std::conditional<true,std::integral_constant<int,0>,void>::type::value;
+ ])],
+ dune_cv_cxx11_conditional_support=yes,
+ dune_cv_cxx11_conditional_support=no)
+ AC_LANG_POP
+ ])
+ if test "x$dune_cv_cxx11_conditional_support" = xyes; then
+ AC_DEFINE(HAVE_STD_CONDITIONAL, 1, [Define to 1 if C++11 std::conditional is supported])
+ fi
+])
diff --git a/m4/dune.m4 b/m4/dune.m4
index 1215df0ab15f7374251f8201621888bb5c84d9f2..154dbfab8ec61f61388f10c05b056c53af4383dc 100644
--- a/m4/dune.m4
+++ b/m4/dune.m4
@@ -438,8 +438,8 @@ AC_DEFUN([DUNE_CHECK_MODULES],[
AC_LINK_IFELSE(
[AC_LANG_PROGRAM(
- [#]include<dune/[]_dune_header>,
- _dune_symbol)],
+ [[#]include<dune/[]_dune_header>],
+ [[_dune_symbol]])],
[dune_cv_lib[]_dune_lib=yes],
[dune_cv_lib[]_dune_lib=no])
])
diff --git a/m4/dune_common.m4 b/m4/dune_common.m4
index 651a23e09dcdece8e674ea763e068ff5d810b3d7..639397b43e64431b75c88374f574c0e325818cab 100644
--- a/m4/dune_common.m4
+++ b/m4/dune_common.m4
@@ -24,6 +24,7 @@ AC_DEFUN([DUNE_COMMON_CHECKS],
AC_REQUIRE([SHARED_PTR])
AC_REQUIRE([VARIADIC_TEMPLATES_CHECK])
AC_REQUIRE([RVALUE_REFERENCES_CHECK])
+ AC_REQUIRE([CXX11_CONDITIONAL_CHECK])
AC_REQUIRE([DUNE_BOOST_BASE])
AC_REQUIRE([MAKE_SHARED])
AC_REQUIRE([DUNE_LINKCXX])
diff --git a/m4/mpi-config.m4 b/m4/mpi-config.m4
index 644f4d5d5487850b03fd6d4423d2ca4bd27cc6c4..b5c5891eb8df3485c98e0181f6214fd7a676b2e5 100644
--- a/m4/mpi-config.m4
+++ b/m4/mpi-config.m4
@@ -5,6 +5,12 @@ mpi_trybuild () {
return 0
}
+mpi_trybuild_run () {
+ mpi_trybuild "-o conftest ${1}" || return 1
+ ./conftest 2>&1 || return 1
+ return 0
+}
+
mpi_preprocess () {
$MPICC -E -c ${1} 2> /dev/null
}
@@ -177,7 +183,29 @@ _EOF
AC_MSG_RESULT([yes])
rm -f conftest*
- return 0
+ return 0
+ fi
+
+ rm -f conftest*
+ AC_MSG_RESULT([no])
+ return 1
+}
+
+test_mpich3 () {
+ AC_MSG_CHECKING([for mpich 3.x])
+ cat >conftest.c <<_EOF
+#include <mpi.h>
+#include <stdio.h>
+int main() { printf ("%s\n", MPICH_VERSION); return 0; }
+_EOF
+
+ if (mpi_trybuild_run "conftest.c" | grep -q "^3\.") ; then
+ dune_MPI_VERSION="MPICH2"
+ mpi_getmpich2flags
+
+ AC_MSG_RESULT([yes])
+ rm -f conftest*
+ return 0
fi
rm -f conftest*
@@ -316,6 +344,7 @@ get_mpiparameters() {
test_mvapich && return
test_mvapich2 && return
test_mpich2 && return
+ test_mpich3 && return
test_ibmmpi && return
test_intelmpi && return
diff --git a/m4/parmetis.m4 b/m4/parmetis.m4
index 8c15ae0f08c32d748ca1ae4b44ce8734027093dc..8e8ae242f553e7feac1de207bf3544ad9d4c7ea1 100644
--- a/m4/parmetis.m4
+++ b/m4/parmetis.m4
@@ -148,13 +148,12 @@ AC_DEFUN([DUNE_PATH_PARMETIS],[
This is only true if MPI was found by configure
_and_ if the application uses the PARMETIS_CPPFLAGS])
AC_MSG_RESULT(ok)
-
- # add to global list
- DUNE_PKG_LIBS="$PARMETIS_LIBS $DUNE_PKG_LIBS"
- DUNE_PKG_LDFLAGS="$DUNE_PKG_LDFLAGS $PARMETIS_LDFLAGS"
- DUNE_PKG_CPPFLAGS="$DUNE_PKG_CPPFLAGS $PARMETIS_CPPFLAGS"
-
- # re-set variable correctly
+
+ # add to global list
+ DUNE_ADD_ALL_PKG([PARMETIS], [\${PARMETIS_CPPFLAGS}],
+ [\${PARMETIS_LDFLAGS}], [\${PARMETIS_LIBS}])
+
+ # re-set variable correctly
with_parmetis="yes"
else
with_parmetis="no"