]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Documentation: Clarify RELDIR handling 2803/head
authorMatthias Maier <tamiko@43-1.org>
Mon, 11 Jul 2016 10:51:27 +0000 (05:51 -0500)
committerMatthias Maier <tamiko@43-1.org>
Mon, 11 Jul 2016 10:51:27 +0000 (05:51 -0500)
doc/users/cmake.html
doc/users/cmakelists.html

index 6ad040c450245c79333f196c535d1ca731e95b84..43af69f0474829410b45d35c15280cab9856da1f 100644 (file)
@@ -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:
 <pre class="cmake">
-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
 </pre>
     </p>
 
index ecc73de2a80432bc5c6cd971a6391374f5aaf701..3bd4b58578de90168b0c6731eb33a01a1d71f1d8 100644 (file)
   <ol>
     <li><a href="#cmakesimple">Simple <code>CMakeLists.txt</code></a>
       <ol>
-       <li><a href="#cmakesimple.multiple">Adding multiple executable targets</a></li>
-       <li><a href="#cmakesimple.libs">Adding libraries and common source files</a></li>
-       <li><a href="#cmakesimple.build_type">Switching build types</a></li>
-       <li><a href="#cmakesimple.run">Adding a "run" target</a></li>
+        <li><a href="#cmakesimple.multiple">Adding multiple executable targets</a></li>
+        <li><a href="#cmakesimple.libs">Adding libraries and common source files</a></li>
+        <li><a href="#cmakesimple.build_type">Switching build types</a></li>
+        <li><a href="#cmakesimple.run">Adding a "run" target</a></li>
       </ol>
     </li>
     <li><a href="#cmakeadvanced">Advanced <code>CMakeLists.txt</code></a>

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.