Skip to content
Snippets Groups Projects
Commit da913e46 authored by Thomas Fetzer's avatar Thomas Fetzer
Browse files

[cmake] Remove dune2.5 specific stuff

parent ba02e2b7
No related branches found
No related tags found
1 merge request!961[cmake] Remove dune2.5 specific stuff
......@@ -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)
......
......@@ -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)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment