Commit 43f4970e authored by Markus Blatt's avatar Markus Blatt

[release,cmake] Fixes installation of various files.

parent b49d0326
......@@ -36,12 +36,9 @@ set(GRIDDIM 2)
set_property(DIRECTORY APPEND PROPERTY
COMPILE_DEFINITIONS "DUNE_GRID_HOWTO_EXAMPLE_GRIDS_PATH=\"${PROJECT_SOURCE_DIR}/grids/\"")
# TODO:
#set(examplesdir ${CMAKE_INSTALL_DOCDIR}/dune-grid-howto/examples)
#
# set(examples_DATA gettingstarted.cc traversal.cc integration.cc othergrids.cc
# adaptiveintegration.cc finitevolume.cc adaptivefinitevolume.cc
# parfinitevolume.cc visualization.cc finiteelements.cc)
set(examples_DATA gettingstarted.cc traversal.cc integration.cc othergrids.cc
adaptiveintegration.cc finitevolume.cc adaptivefinitevolume.cc
parfinitevolume.cc visualization.cc finiteelements.cc)
set(TESTS
adaptivefinitevolume
......@@ -139,7 +136,10 @@ install(FILES
unitcube_yaspgrid.hh
vertexdata.hh
vtkout.hh
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
DESTINATION ${CMAKE_INSTALL_DOCDIR}/examples)
install(FILES ${examples_DATA} DESTINATION ${CMAKE_INSTALL_DOCDIR}/examples)
install(TARGETS ${TESTS} DESTINATION ${CMAKE_INSTALL_DOCDIR}/examples)
# finalize the dune project, e.g. generating config.h etc.
finalize_dune_project(GENERATE_CONFIG_H_CMAKE)
......@@ -110,3 +110,5 @@ dune_add_latex_document(grid-howto.tex
INPUTS grid-howto.tex config.inc ${SOURCES}
IMAGES ${IMAGES})
create_doc_install(${CMAKE_CURRENT_BINARY_DIR}/grid-howto.pdf ${CMAKE_INSTALL_DOCDIR})
install(FILES navigation.html css.html DESTINATION ${CMAKE_INSTALL_DOCDIR})
......@@ -2,9 +2,8 @@ set(GRIDS
2dgrid.al
2dsimplex.alu
3dgrid.al
Makefile.am
unitcube1.dgf
unitcube2.dgf
unitcube3.dgf)
install(FILES ${GRIDS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/grids)
install(FILES ${GRIDS} DESTINATION ${CMAKE_INSTALL_DOCDIR}/examples/grids)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment