[dune-grid] 01/01: Install example grids to /usr/share/dune-grid/grids.

[Ansgar Burchardt]

This is an automated email from the git hooks/post-receive script.

ansgar pushed a commit to branch master
in repository dune-grid.

commit 7c6184b048a7a8855f65d35193309c0718317403
Author: Ansgar Burchardt <Ansgar.Burchardt at tu-dresden.de>
Date:   Tue Dec 6 00:48:00 2016 +0100

    Install example grids to /usr/share/dune-grid/grids.
---
 .../patches/example-grids-install-location.patch   | 59 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 60 insertions(+)

diff --git a/debian/patches/example-grids-install-location.patch b/debian/patches/example-grids-install-location.patch
new file mode 100644
index 0000000..14c508b
--- /dev/null
+++ b/debian/patches/example-grids-install-location.patch
@@ -0,0 +1,59 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -21,6 +21,9 @@
+ # start a dune project with information from dune.module
+ dune_project()
+ 
++set(DUNE_GRID_EXAMPLE_GRIDS_INSTALL_DIR "${CMAKE_INSTALL_DATADIR}/dune-grid/grids")
++set(DUNE_GRID_EXAMPLE_GRIDS_INSTALL_FULL_DIR "${CMAKE_INSTALL_FULL_DATADIR}/dune-grid/grids")
++
+ add_subdirectory("dune")
+ add_subdirectory("doc")
+ add_subdirectory("lib")
+@@ -29,7 +32,7 @@
+ 
+ # Use a  custom section to export path to the grid examples.
+ set(DUNE_CUSTOM_PKG_CONFIG_SECTION "#Export the directory with the grid example for downstream modules
+-set(DUNE_GRID_EXAMPLE_GRIDS_PATH \"@DUNE_MODULE_SRC_DOCDIR@/grids/\")
++set(DUNE_GRID_EXAMPLE_GRIDS_PATH \"${DUNE_GRID_EXAMPLE_GRIDS_INSTALL_FULL_DIR}/\")
+ ")
+ # finalize the dune project, e.g. generating config.h etc.
+ finalize_dune_project(GENERATE_CONFIG_H_CMAKE)
+--- a/doc/grids/amc/CMakeLists.txt
++++ b/doc/grids/amc/CMakeLists.txt
+@@ -10,4 +10,4 @@
+   periodic-torus.amc)
+ 
+ install(FILES ${GRIDS}
+-  DESTINATION ${CMAKE_INSTALL_DOCDIR}/grids/amc)
++  DESTINATION ${DUNE_GRID_EXAMPLE_GRIDS_INSTALL_DIR}/amc)
+--- a/doc/grids/dgf/CMakeLists.txt
++++ b/doc/grids/dgf/CMakeLists.txt
+@@ -46,4 +46,4 @@
+   unstr_cube.dgf)
+ 
+ install(FILES ${GRIDS}
+-  DESTINATION ${CMAKE_INSTALL_DOCDIR}/grids/dgf)
++  DESTINATION ${DUNE_GRID_EXAMPLE_GRIDS_INSTALL_DIR}/dgf)
+--- a/doc/grids/gmsh/CMakeLists.txt
++++ b/doc/grids/gmsh/CMakeLists.txt
+@@ -19,4 +19,4 @@
+   telescope.msh
+   twotets.geo
+   twotets.msh)
+-install(FILES ${GRIDS} DESTINATION ${CMAKE_INSTALL_DOCDIR}/grids/gmsh)
++install(FILES ${GRIDS} DESTINATION ${DUNE_GRID_EXAMPLE_GRIDS_INSTALL_DIR}/gmsh)
+--- a/doc/grids/gridfactory/CMakeLists.txt
++++ b/doc/grids/gridfactory/CMakeLists.txt
+@@ -1,2 +1,2 @@
+ install(FILES hybridtestgrids.hh testgrids.hh
+-  DESTINATION ${CMAKE_INSTALL_DOCDIR}/grids/gridfactory)
++  DESTINATION ${DUNE_GRID_EXAMPLE_GRIDS_INSTALL_DIR}/gridfactory)
+--- a/doc/grids/starcd/CMakeLists.txt
++++ b/doc/grids/starcd/CMakeLists.txt
+@@ -9,4 +9,4 @@
+   withpyramid.cel)
+ 
+ install(FILES ${GRIDS}
+-  DESTINATION ${CMAKE_INSTALL_DOCDIR}/grids/starcd)
++  DESTINATION ${DUNE_GRID_EXAMPLE_GRIDS_INSTALL_DIR}/starcd)
diff --git a/debian/patches/series b/debian/patches/series
index cae31b7..314e9ed 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 disable-alberta3d-test.patch
 do-not-install-amiramesh-grids.patch
+example-grids-install-location.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/dune-grid.git