]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Some more polishing
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 6 Nov 2012 10:55:23 +0000 (10:55 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 6 Nov 2012 10:55:23 +0000 (10:55 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@27423 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/doc/cmake.html

index 6c4d4649574168e06a97328920fde6eeef7d32c9..dc7d452824457c921b1a8ffd197c600180a1da91 100644 (file)
 
     <p>
       There are some options to determine the behavior of the dependency
-      resolution. Specifically, the
-      option <code>DEAL_II_ALLOW_BUNDLED</code> determines the
-      following:
+      resolution.
       <ul>
-       <li> If set to <code>ON</code> external libraries still have
-         precedence. But if there is no external library the bundled
-         library will be used.
-
-        <li> If set to <code>OFF</code> bundled libraries will not be
-         used and the dependency resolution will fail if there is no
-         external library
-
-       <li><code>DEAL_II_FORCE_BUNDLED_&lt;library&gt;</code> forces
-         the use of the bundled library regardless whether
-         <code>DEAL_II_ALLOW_BUNDLED</code> is set to <code>OFF</code>
-         or an external library is found. This applies to the options
-         <code>DEAL_II_FORCE_BUNDLED_(BOOST|FUNCTIONPARSER|THREADS|UMFPACK)</code>.
+        <li>
+          <p>
+            <code>DEAL_II_ALLOW_BUNDLED</code>:
+          </p>
+          <p>
+            If set to <code>ON</code> external libraries still have
+            precedence. But if there is no external library the bundled
+            library will be used.
+            If set to <code>OFF</code> bundled libraries will not be
+            used and the dependency resolution will fail if there is no
+            external library.
+          </p>
+        <li>
+          <p>
+            <code>DEAL_II_FORCE_BUNDLED_(BOOST|FUNCTIONPARSER|THREADS|UMFPACK)</code>:
+          </p>
+          <p>
+            Forces the use of the bundled library regardless whether
+            <code>DEAL_II_ALLOW_BUNDLED</code> is set to <code>OFF</code>
+            or an external library is found.
+          </p>
+        <li>
+          Thus, to ensure that no bundled library is used at all
+          <code>DEAL_II_ALLOW_BUNDLED</code>, as well as every
+          <code>DEAL_II_FORCE_BUNDLED_&lt;library&gt;</code>
+          have to be set to <code>OFF</code>.  Conversely,
+          <code>DEAL_II_FORCE_BUNDLED_&lt;library&gt;=ON</code>
+          will not automatically enable the corresponding
+          <code>DEAL_II_WITH_&lt;feature&gt;</code> toggle. This has to be
+          set separately.
       </ul>
     </p>
 
-    <p>
-      Thus, to ensure that no bundled library is used at all
-      <code>DEAL_II_ALLOW_BUNDLED</code>, as well as every
-      <code>DEAL_II_FORCE_BUNDLED_&lt;library&gt;</code>
-      have to be set to <code>OFF</code>.  Conversely,
-      </code>DEAL_II_FORCE_BUNDLED_&lt;library&gt;=ON</code>
-      will not automatically enable the corresponding
-      <code>DEAL_II_WITH_&lt;feature&gt;</code> toggle. This has to be
-      set separately.
-    </p>
 
 
     <a name="tuningautoconf"></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.