From: Matthias Maier Date: Mon, 11 Jul 2016 10:51:27 +0000 (-0500) Subject: Documentation: Clarify RELDIR handling X-Git-Tag: v8.5.0-rc1~889^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2d7c9111628e973e3e1df827f1dd6974cff599fd;p=dealii.git Documentation: Clarify RELDIR handling --- diff --git a/doc/users/cmake.html b/doc/users/cmake.html index 6ad040c450..43af69f047 100644 --- a/doc/users/cmake.html +++ b/doc/users/cmake.html @@ -921,7 +921,6 @@ ${CMAKE_INSTALL_PREFIX}/ lib${LIB_SUFFIX} lib${LIB_SUFFIX}/cmake/deal.II share/deal.II/ - share/deal.II/cmake/macros ./ doc examples @@ -933,14 +932,14 @@ ${CMAKE_INSTALL_PREFIX}/ The default directory structure can be changed by setting the following variables:
-DEAL_II_EXECUTABLE_RELDIR
-DEAL_II_INCLUDE_RELDIR
-DEAL_II_LIBRARY_RELDIR
-DEAL_II_PROJECT_CONFIG_RELDIR
-DEAL_II_SHARE_RELDIR
-DEAL_II_DOCREADME_RELDIR
-DEAL_II_DOCHTML_RELDIR
-DEAL_II_EXAMPLES_RELDIR
+DEAL_II_EXECUTABLE_RELDIR       default: bin
+DEAL_II_INCLUDE_RELDIR          default: include
+DEAL_II_LIBRARY_RELDIR          default: lib${LIB_SUFFIX}
+DEAL_II_PROJECT_CONFIG_RELDIR   default: lib${LIB_SUFFIX}/cmake/deal.II
+DEAL_II_SHARE_RELDIR            default: share/deal.II/
+DEAL_II_DOCREADME_RELDIR        default: ./
+DEAL_II_DOCHTML_RELDIR          default: doc
+DEAL_II_EXAMPLES_RELDIR         default: examples
 

diff --git a/doc/users/cmakelists.html b/doc/users/cmakelists.html index ecc73de2a8..3bd4b58578 100644 --- a/doc/users/cmakelists.html +++ b/doc/users/cmakelists.html @@ -26,10 +26,10 @@
  1. Simple CMakeLists.txt
      -
    1. Adding multiple executable targets
    2. -
    3. Adding libraries and common source files
    4. -
    5. Switching build types
    6. -
    7. Adding a "run" target
    8. +
    9. Adding multiple executable targets
    10. +
    11. Adding libraries and common source files
    12. +
    13. Switching build types
    14. +
    15. Adding a "run" target
  2. Advanced CMakeLists.txt