]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Place related options next to each other in the input file.
authorbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Sat, 15 Sep 2012 20:35:01 +0000 (20:35 +0000)
committerbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Sat, 15 Sep 2012 20:35:01 +0000 (20:35 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@26398 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/CMakeLists.txt

index 6f7eeae371a16e048d7a1a4da0f7bae0901d16a4..f144c87831b8aa51e18a737b22e8d65ca9a23da1 100644 (file)
@@ -77,7 +77,8 @@ SET(VERSION "8.0.pre")
 ###########################################################################
 
 #
-# Feature selection:
+# Feature selection: external libraries and where to take them (if there
+# is a choice, e.g. from contrib vs external)
 #
 
 OPTION(DEAL_II_FEATURE_AUTODETECTION
@@ -86,6 +87,14 @@ OPTION(DEAL_II_FEATURE_AUTODETECTION
   not."
   ON)
 
+OPTION(DEAL_II_ALLOW_CONTRIB
+  "Allow the use of contrib libraries bundled with the source tarball.
+  Note: If set to off DEAL_II_FORCE_CONTRIB* will still pull in bundled
+  packages, so to ensure that only external libraries are used
+  DEAL_II_ALLOW_CONTRIB as well as all DEAL_II_FORCE_CONTRIB_* have to be
+  OFF"
+  ON)
+
 OPTION(DEAL_II_WITH_BLAS
   "Build deal.II with support for BLAS."
   OFF)
@@ -93,6 +102,10 @@ OPTION(DEAL_II_WITH_BLAS
 OPTION(DEAL_II_WITH_FUNCTIONPARSER
   "Build deal.II with support for functionparser."
   OFF)
+OPTION(DEAL_II_FORCE_CONTRIB_FUNCTIONPARSER
+  "Always use the bundled functionparser library instead of an external one."
+  ON)
+
 
 OPTION(DEAL_II_WITH_LAPACK
   "Build deal.II with support for LAPACK."
@@ -113,42 +126,25 @@ OPTION(DEAL_II_WITH_NETCDF
 OPTION(DEAL_II_WITH_TBB
   "Build deal.II with support for tbb. This will enable thread support in deal.II."
   OFF)
+OPTION(DEAL_II_FORCE_CONTRIB_TBB
+  "Always use the bundled tbb library instead of an external one."
+  ON)
 
 OPTION(DEAL_II_WITH_UMFPACK
   "Build deal.II with support for UMFPACK."
   OFF)
+OPTION(DEAL_II_FORCE_CONTRIB_UMFPACK
+  "Always use the bundled umfpack library instead of an external one."
+  ON)
 
 OPTION(DEAL_II_WITH_ZLIB
   "Build deal.II with support for zlib."
   OFF)
 
-#
-# Options for library selection:
-#
-
-OPTION(DEAL_II_ALLOW_CONTRIB
-  "Allow the use of contrib libraries bundled with the source tarball.
-  Note: If set to off DEAL_II_FORCE_CONTRIB* will still pull in bundled
-  packages, so to ensure that only external libraries are used
-  DEAL_II_ALLOW_CONTRIB as well as all DEAL_II_FORCE_CONTRIB_* have to be
-  OFF"
-  ON)
-
-OPTION(DEAL_II_FORCE_CONTRIB_FUNCTIONPARSER
-  "Always use the bundled functionparser library instead of an external one."
-  ON)
-
 OPTION(DEAL_II_FORCE_CONTRIB_BOOST
   "Always use the bundled boost library instead of an external one."
   ON)
 
-OPTION(DEAL_II_FORCE_CONTRIB_TBB
-  "Always use the bundled tbb library instead of an external one."
-  ON)
-
-OPTION(DEAL_II_FORCE_CONTRIB_UMFPACK
-  "Always use the bundled umfpack library instead of an external one."
-  ON)
 
 #
 # Compatibility support:

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.