From da913e46c3b43cff5bf9a7b325f5f1d326765852 Mon Sep 17 00:00:00 2001
From: Thomas Fetzer <thomas.fetzer@iws.uni-stuttgart.de>
Date: Mon, 7 May 2018 10:57:20 +0200
Subject: [PATCH] [cmake] Remove dune2.5 specific stuff
---
cmake/modules/DumuxTestMacros.cmake | 2 +-
doc/handbook/CMakeLists.txt | 26 ++++++--------------------
2 files changed, 7 insertions(+), 21 deletions(-)
diff --git a/cmake/modules/DumuxTestMacros.cmake b/cmake/modules/DumuxTestMacros.cmake
index af926f4375..fd437823f1 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 c2e68c3391..623c6e3b3f 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)
--
GitLab