Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
dumux
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
dumux-repositories
dumux
Commits
da913e46
Commit
da913e46
authored
6 years ago
by
Thomas Fetzer
Browse files
Options
Downloads
Patches
Plain Diff
[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
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
cmake/modules/DumuxTestMacros.cmake
+1
-1
1 addition, 1 deletion
cmake/modules/DumuxTestMacros.cmake
doc/handbook/CMakeLists.txt
+6
-20
6 additions, 20 deletions
doc/handbook/CMakeLists.txt
with
7 additions
and
21 deletions
cmake/modules/DumuxTestMacros.cmake
+
1
−
1
View file @
da913e46
...
...
@@ -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
)
...
...
This diff is collapsed.
Click to expand it.
doc/handbook/CMakeLists.txt
+
6
−
20
View file @
da913e46
...
...
@@ -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
)
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment