diff --git a/cmake/modules/DumuxTestMacros.cmake b/cmake/modules/DumuxTestMacros.cmake index af926f43750c3263d209c75b42a7517b2fbff6b1..fd437823f1983d6256cbe0260c8042c405e58609 100644 --- a/cmake/modules/DumuxTestMacros.cmake +++ b/cmake/modules/DumuxTestMacros.cmake @@ -14,7 +14,7 @@ ### macro(add_dumux_test dumux_test dumux_test_executable dumux_test_executable_source) - message(WARNING "add_dumux_test is deprecated. Use dune_add_test directly now that we require dune 2.5") + message(WARNING "add_dumux_test is deprecated. Use dune_add_test directly now that we require dune 2.6") # if present, symlink the grids folder set(grids_directory ${CMAKE_CURRENT_SOURCE_DIR}/grids) diff --git a/doc/handbook/CMakeLists.txt b/doc/handbook/CMakeLists.txt index c2e68c339175cc825cda443391e8cf5348d79739..623c6e3b3fefaf969999a885a385d8e7b95f327f 100644 --- a/doc/handbook/CMakeLists.txt +++ b/doc/handbook/CMakeLists.txt @@ -28,24 +28,10 @@ set(TEX_IMAGES PNG/dunedesign.png ../logo/dumux_logo_hires_whitebg.png) -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}) +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}) -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() +create_doc_install(${CMAKE_CURRENT_BINARY_DIR}/0_dumux-handbook.pdf + ${CMAKE_INSTALL_DOCDIR} 0_dumux-handbook)