CMake: Add a configuration option for mathjax

git-svn-id: https://svn.dealii.org/trunk@32134 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/cmake/modules/FindDEALII_LAPACK.cmake b/deal.II/cmake/modules/FindDEALII_LAPACK.cmake
index 903c19235df796259a0cde257aa964ddfa470d08..378851f71cfb5c35635711555746d343fba478da 100644 (file)
--- a/deal.II/cmake/modules/FindDEALII_LAPACK.cmake
+++ b/deal.II/cmake/modules/FindDEALII_LAPACK.cmake
@@ -51,8 +51,11 @@ SET(CMAKE_PREFIX_PATH ${_cmake_prefix_path_backup})
 
 MARK_AS_ADVANCED(
   atlas_LIBRARY
+  atlcblas_LIBRARY
+  atllapack_LIBRARY
   blas_LIBRARY
   eigen_blas_LIBRARY
+  f77blas_LIBRARY
   gslcblas_LIBRARY
   lapack_LIBRARY
   m_LIBRARY

diff --git a/deal.II/cmake/setup_cached_variables.cmake b/deal.II/cmake/setup_cached_variables.cmake
index 3cad88e7d21be58ea0e3d7f25d57eb6349e3ae8a..c4fc91f1dd986fc0254585b78cf23a998c638747 100644 (file)
--- a/deal.II/cmake/setup_cached_variables.cmake
+++ b/deal.II/cmake/setup_cached_variables.cmake
@@ -49,6 +49,10 @@
 #
 #     DEAL_II_WITH_64BIT_INDICES
 #
+# Miscellaneous options:
+#     DEAL_II_DOXYGEN_USE_MATHJAX
+#
+#
 # *)  May also be set via environment variable (CXXFLAGS, LDFLAGS)
 #     (a nonempty cached variable has precedence and will not be
 #     overwritten by environment)
@@ -331,6 +335,12 @@ OPTION(DEAL_II_WITH_64BIT_INDICES
 #                                                                      #
 ########################################################################
 
+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"):

diff --git a/deal.II/doc/doxygen/CMakeLists.txt b/deal.II/doc/doxygen/CMakeLists.txt
index cdeeeebb782ef3d6a51ccb8ba962752da25ec338..e813105703504d08c5cc13f522f8efc4c9cd8a29 100644 (file)
--- a/deal.II/doc/doxygen/CMakeLists.txt
+++ b/deal.II/doc/doxygen/CMakeLists.txt
@@ -50,6 +50,11 @@ ADD_SUBDIRECTORY(tutorial) # uses ${DEAL_II_STEPS}
 #
 # Prepare auxiliary files for doxygen:
 #
+IF(DEAL_II_DOXYGEN_USE_MATHJAX)
+  SET(_use_mathjax YES)
+ELSE()
+  SET(_use_mathjax NO)
+ENDIF()
 CONFIGURE_FILE(
   ${CMAKE_CURRENT_SOURCE_DIR}/options.dox.in
   ${CMAKE_CURRENT_BINARY_DIR}/options.dox

diff --git a/deal.II/doc/doxygen/options.dox.in b/deal.II/doc/doxygen/options.dox.in
index 851d8954c8283e5103e297bb41d78677418e22e0..88ca8938d2f05e240318bc96bb841910cf5f43ce 100644 (file)
--- a/deal.II/doc/doxygen/options.dox.in
+++ b/deal.II/doc/doxygen/options.dox.in
@@ -98,7 +98,7 @@ HTML_OUTPUT            = deal.II
 HTML_FILE_EXTENSION    = .html
 HTML_HEADER            = header.html
 HTML_FOOTER            = footer.html
-USE_MATHJAX            = NO
+USE_MATHJAX            = @_use_mathjax@
 MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
 MATHJAX_EXTENSIONS     = TeX/AMSmath TeX/AMSsymbols
 HTML_COLORSTYLE_HUE    = 220