diff --git a/COPYING b/COPYING
index 50efec39cc42245f46297d3b0b2351f5fc7c22b2..4b13ef2c2a5a16ac2b0bbb093367fe02b17db6bd 100644
--- a/COPYING
+++ b/COPYING
@@ -1,44 +1,51 @@
Copyright holders:
+2015 Martin Alkämper
2003--2010 Peter Bastian
-2004--2013 Markus Blatt
+2004--2015 Markus Blatt
2013 Andreas Buhr
-2011--2013 Ansgar Burchardt
+2011--2015 Ansgar Burchardt
2004--2005 Adrian Burri
2014 Benjamin Bykowski (may appear in the logs as "Convex Function")
-2006--2013 Andreas Dedner
+2014 Marco Cecchetti
+2006--2014 Andreas Dedner
2003 Marc Droske
-2003--2013 Christian Engwer
-2004--2012 Jorrit Fahlke
+2003--2015 Christian Engwer
+2004--2015 Jorrit Fahlke
2008--2013 Bernd Flemisch
-2013 Christoph Gersbacher
-2005--2013 Carsten Gräser
-2010--2013 Christoph Grüninger
+2013--2014 Christoph Gersbacher
+2015 Stefan Girke
+2005--2015 Carsten Gräser
+2015 Felix Gruber
+2010--2015 Christoph Grüninger
2006 Bernhard Haasdonk
+2015 Claus-Justus Heine
2012--2013 Olaf Ippisch
-2013 Dominic Kempf
+2013--2015 Dominic Kempf
2009 Leonard Kern
2013 Torbjörn Klatt
-2003--2013 Robert Klöfkorn
+2003--2015 Robert Klöfkorn
2005--2007 Sreejith Pulloor Kuttanikkad
-2012--2013 Arne Morten Kvarving
-2010--2013 Andreas Lauser
+2012--2014 Arne Morten Kvarving
+2010--2014 Andreas Lauser
2007--2011 Sven Marnach
-2012--2013 Tobias Malkmus
+2012--2015 Tobias Malkmus
2010 Rene Milk
-2011--2013 Steffen Müthing
+2011--2015 Steffen Müthing
2003--2006 Thimo Neubauer
2011 Rebecca Neumann
-2008--2013 Martin Nolte
+2008--2015 Martin Nolte
+2014 Andreas Nüßing
2004--2005 Mario Ohlberger
-2008--2013 Elias Pipping
+2014 Steffen Persvold
+2008--2014 Elias Pipping
2011 Dan Popovic
2009 Atgeirr Rasmussen
-2003--2013 Oliver Sander
-2006--2011 Uli Sack
+2003--2015 Oliver Sander
+2006--2014 Uli Sack
2006 Klaus Schneider
2004 Roland Schulz
-2009--2012 BÃ¥rd Skaflestad
+2009--2014 BÃ¥rd Skaflestad
2012 Matthias Wohlmuth
2011 Jonathan Youett
diff --git a/bin/dunecontrol b/bin/dunecontrol
index 24ba0cb73ddf33edfbadaf7ccb5b36b73f949f9f..b8d222a97f03297d1b08e8e72a0477745708f21d 100755
--- a/bin/dunecontrol
+++ b/bin/dunecontrol
@@ -716,7 +716,7 @@ run_default_configure () {
SRCDIR="$PWD"
cd "$ABS_BUILDDIR"
# check for libtool libs, which might break modules depending on this module
- test -n "`find -name \*.la`" && \
+ test -n "`find . -name \*.la`" && \
echo "Error: your build directory $ABS_BUILDDIR contains libtool built libraries, please cleanup" && \
exit 1
echo "$PREPARAMS $CMAKE -DCMAKE_MODULE_PATH=\"$CMAKE_MODULE_PATH\" $CMAKE_PARAMS $CMAKE_FLAGS \"$SRCDIR\""
diff --git a/cmake/modules/CMakeLists.txt b/cmake/modules/CMakeLists.txt
index 4b2ffdee0fed460876cfca570c0f655be061fa35..c808c3d3e9275c796971142924dc58f226131410 100644
--- a/cmake/modules/CMakeLists.txt
+++ b/cmake/modules/CMakeLists.txt
@@ -11,6 +11,7 @@ set(modules
DuneCxaDemangle.cmake
DuneDoc.cmake
DuneDoxygen.cmake
+ DuneEnableAllPackages.cmake
DuneMacros.cmake
DuneMPI.cmake
DunePkgConfig.cmake
@@ -25,9 +26,13 @@ set(modules
FindMProtect.cmake
FindParMETIS.cmake
FindPTScotch.cmake
+ FindThreadsCMake31.cmake
FindUMFPack.cmake
Headercheck.cmake
LanguageSupport.cmake
UseInkscape.cmake
UseLATEX.cmake)
-install(FILES ${modules} DESTINATION ${DUNE_INSTALL_MODULEDIR})
+set(test_programs CheckForPthreads.c)
+install(FILES ${modules}
+ ${test_programs}
+ DESTINATION ${DUNE_INSTALL_MODULEDIR})
diff --git a/cmake/modules/DuneMacros.cmake b/cmake/modules/DuneMacros.cmake
index 8421d02474d69720e5219298bbef709acfb302a3..d695176d411df83b3099a7809e7344664c804956 100644
--- a/cmake/modules/DuneMacros.cmake
+++ b/cmake/modules/DuneMacros.cmake
@@ -967,7 +967,7 @@ macro(dune_add_library basename)
set_property(GLOBAL PROPERTY DUNE_MODULE_LIBRARIES ${_prop} ${basename})
# link with specified libraries.
if(DUNE_LIB_ADD_LIBS)
- dune_target_link_libraries(${basename} ${DUNE_LIB_ADD_LIBS})
+ dune_target_link_libraries(${basename} "${DUNE_LIB_ADD_LIBS}")
endif(DUNE_LIB_ADD_LIBS)
if(DUNE_LIB_COMPILE_FLAGS)
set_property(${basename} APPEND_STRING COMPILE_FLAGS
@@ -991,7 +991,7 @@ macro(dune_add_library basename)
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})
+ dune_target_link_libraries(${basename}-static "${DUNE_LIB_ADD_LIBS}")
endif(DUNE_LIB_ADD_LIBS)
if(DUNE_LIB_COMPILE_FLAGS)
set_property(${basename}-static APPEND_STRING COMPILE_FLAGS
@@ -1005,7 +1005,7 @@ macro(dune_add_library 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})
+ dune_target_link_libraries(${basename}-shared "${DUNE_LIB_ADD_LIBS}")
endif(DUNE_LIB_ADD_LIBS)
if(DUNE_LIB_COMPILE_FLAGS)
set_property(${basename}-shared APPEND_STRING COMPILE_FLAGS
diff --git a/cmake/modules/Makefile.am b/cmake/modules/Makefile.am
index 8697915c27ca42a8aa5a2f40f29b143dafbbd517..87a7ad1795f770abb3f4cbbfa25debb229c31177 100644
--- a/cmake/modules/Makefile.am
+++ b/cmake/modules/Makefile.am
@@ -11,6 +11,7 @@ MODULES = \
DuneCxaDemangle.cmake \
DuneDoc.cmake \
DuneDoxygen.cmake \
+ DuneEnableAllPackages.cmake \
DuneMacros.cmake \
DuneMPI.cmake \
DunePkgConfig.cmake \
@@ -25,14 +26,17 @@ MODULES = \
FindMProtect.cmake \
FindParMETIS.cmake \
FindPTScotch.cmake \
+ FindThreadsCMake31.cmake \
FindUMFPack.cmake \
Headercheck.cmake \
LanguageSupport.cmake \
UseInkscape.cmake \
UseLATEX.cmake
+TESTPROGRAMS = CheckForPthreads.c
+
modulesdir = $(datadir)/dune/cmake/modules
-dist_modules_DATA = ${MODULES}
+dist_modules_DATA = ${MODULES} ${TESTPROGRAMS}
include $(top_srcdir)/am/global-rules
EXTRA_DIST = CMakeLists.txt
diff --git a/dune/common/fmatrixev.hh b/dune/common/fmatrixev.hh
index dc1c24e9a42888eee174fe439ab076643da0faa8..7b3942e541dd3b349bddd4f182bb44867379f7b9 100644
--- a/dune/common/fmatrixev.hh
+++ b/dune/common/fmatrixev.hh
@@ -85,9 +85,10 @@ namespace Dune {
\note If the input matrix is not symmetric the behavior of this method is undefined.
This implementation was adapted from the pseudo-code (Python?) implementation found on
- http://en.wikipedia.org/wiki/Eigenvalue_algorithm (retrieved lated August 2014).
+ http://en.wikipedia.org/wiki/Eigenvalue_algorithm (retrieved late August 2014).
Wikipedia claims to have taken it from
- Smith, Oliver K. (April 1961), Eigenvalues of a symmetric 3 × 3 matrix., Communications of the ACM 4 (4): 168, doi:10.1145/355578.366316
+ Smith, Oliver K. (April 1961), Eigenvalues of a symmetric 3 × 3 matrix.,
+ Communications of the ACM 4 (4): 168, doi:10.1145/355578.366316
*/
template <typename K>
static void eigenValues(const FieldMatrix<K, 3, 3>& matrix,
diff --git a/dune/common/path.hh b/dune/common/path.hh
index e3dc68464002cc4908410eaaf237c4dba4cd25e8..d079e35b96d012e605bac66a74a32655ad0cc931 100644
--- a/dune/common/path.hh
+++ b/dune/common/path.hh
@@ -24,7 +24,7 @@ namespace Dune {
* \param p The path to concatenate onto base.
*
* If p is an absolute path, return p. Otherwise return the
- * string-concatenation of base and path, possibly with a '/' inbetween, if
+ * string-concatenation of base and path, possibly with a '/' in between, if
* necessary.
*
* Some examples: