CMake: Restructure configuration file

diff --git a/cmake/setup_cached_variables.cmake b/cmake/setup_cached_variables.cmake
index 9b116781524f1d1dad588b31f172a0163647b8f4..281a7efe771ac3597ed204e9dfcb65194d7b90ea 100644 (file)
--- a/cmake/setup_cached_variables.cmake
+++ b/cmake/setup_cached_variables.cmake
@@ -1,6 +1,6 @@
 ## ---------------------------------------------------------------------
 ##
-## Copyright (C) 2012 - 2013 by the deal.II authors
+## Copyright (C) 2012 - 2014 by the deal.II authors
 ##
 ## This file is part of the deal.II library.
 ##
@@ -47,10 +47,11 @@
 #     DEAL_II_LINKER_FLAGS_DEBUG
 #     DEAL_II_LINKER_FLAGS_RELEASE
 #
-#     DEAL_II_WITH_64BIT_INDICES
+# Components and miscellaneous options:
 #
-# Miscellaneous options:
+#     DEAL_II_WITH_64BIT_INDICES
 #     DEAL_II_DOXYGEN_USE_MATHJAX
+#     DEAL_II_CPACK_EXTERNAL_LIBS_TREE
 #
 #
 # *)  May also be set via environment variable (CXXFLAGS, LDFLAGS)
@@ -319,36 +320,35 @@ UNSET(ENV{CXXFLAGS})
 UNSET(ENV{LDFLAGS})
 
 
-
 ########################################################################
 #                                                                      #
-#                             Components:                              #
+#                Components and miscellaneous setup:                   #
 #                                                                      #
 ########################################################################
 
-#
-# Configuration option for the 64 bit indices component:
-#
-
 OPTION(DEAL_II_WITH_64BIT_INDICES
   "If set to ON, then use 64-bit data types to represent global degree of freedom indices. The default is to OFF. You only want to set this to ON if you will solve problems with more than 2^31 (approximately 2 billion) unknowns. If set to ON, you also need to ensure that both Trilinos and/or PETSc support 64-bit indices."
   OFF
   )
 
+OPTION(DEAL_II_DOXYGEN_USE_MATHJAX
+  "If set to ON, doxygen documentation is generated using mathjax"
+  OFF
+  )
+MARK_AS_ADVANCED(DEAL_II_DOXYGEN_USE_MATHJAX)
+
+SET(DEAL_II_CPACK_EXTERNAL_LIBS_TREE "" CACHE PATH
+    "Path to tree of external libraries that will be installed in bundle package."
+  )
+MARK_AS_ADVANCED(DEAL_II_CPACK_EXTERNAL_LIBS_TREE)
 
 
 ########################################################################
 #                                                                      #
-#                         Miscellaneous setup:                         #
+#                               Finalize:                              #
 #                                                                      #
 ########################################################################
 
-OPTION(DEAL_II_DOXYGEN_USE_MATHJAX
-  "If set to ON, doxygen documentation is generated using mathjax"
-  OFF
-  )
-MARK_AS_ADVANCED(DEAL_II_DOXYGEN_USE_MATHJAX)
-
 #
 # We do not support installation into the binary directory any more ("too
 # much pain, not enough profit"):
@@ -408,11 +408,3 @@ FOREACH(_var ${_res})
     UNSET(${_var} CACHE)
   ENDIF()
 ENDFOREACH()
-
-# CPack miscellaneous options
-SET(DEAL_II_CPACK_EXTERNAL_LIBS_TREE "" CACHE PATH
-    "Path to tree of external libraries that will be installed in bundle package."
-  )
-MARK_AS_ADVANCED(DEAL_II_CPACK_EXTERNAL_LIBS_TREE)
-
-