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

fix compatibility of Dumux 2.9 with Dune 2.6

Manual cherry-pick of parts of 55f82e30 and acca9c18.
parent 888c3ec6
......@@ -39,12 +39,24 @@ set(TEX_IMAGES
PNG/dunedesign.png
../logo/dumux_logo_hires_whitebg.png)
dune_add_latex_document(0_dumux-handbook.tex
FATHER_TARGET doc
DEFAULT_PDF
BIBFILES dumux-handbook.bib
INPUTS ${TEX_INPUTS}
IMAGES ${TEX_IMAGES})
if(DUNE_COMMON_VERSION VERSION_LESS 2.5)
# this only works before Dune 2.5
dune_add_latex_document(0_dumux-handbook.tex
FATHER_TARGET doc
DEFAULT_PDF
BIBFILES dumux-handbook.bib
INPUTS ${TEX_INPUTS}
IMAGES ${TEX_IMAGES})
create_doc_install(${CMAKE_CURRENT_BINARY_DIR}/0_dumux-handbook.pdf
${CMAKE_INSTALL_DOCDIR})
create_doc_install(${CMAKE_CURRENT_BINARY_DIR}/0_dumux-handbook.pdf
${CMAKE_INSTALL_DOCDIR})
else()
# the Dune 2.5 way of calling these macros
dune_add_latex_document(0_dumux-handbook.tex
BIBFILES dumux-handbook.bib
INPUTS ${TEX_INPUTS}
IMAGES ${TEX_IMAGES})
create_doc_install(${CMAKE_CURRENT_BINARY_DIR}/0_dumux-handbook.pdf
${CMAKE_INSTALL_DOCDIR} 0_dumux-handbook)
endif()
......@@ -30,7 +30,7 @@
#endif
#include <dune/grid/common/backuprestore.hh>
#if ! DUNE_VERSION_NEWER(DUNE_COMMON, 3, 0)
#if ! DUNE_VERSION_NEWER(DUNE_COMMON, 2, 5)
#include <dune/grid/utility/grapedataioformattypes.hh>
#endif
......@@ -107,7 +107,7 @@ public:
#else
double time = problem.timeManager().time();
problem.grid().template writeGrid
#if ! DUNE_VERSION_NEWER(DUNE_COMMON, 3, 0)
#if ! DUNE_VERSION_NEWER(DUNE_COMMON, 2, 5)
<Dune::xdr>
#endif // Dune < 3.0
(gridName, time);
......
Markdown is supported
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