From: maier Date: Wed, 1 Jan 2014 12:42:27 +0000 (+0000) Subject: CMake: Add a configuration option for mathjax X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a58a333404bfb681152770a6edae3ed9c3df518f;p=dealii-svn.git 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 903c19235d..378851f71c 100644 --- 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 3cad88e7d2..c4fc91f1dd 100644 --- 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 cdeeeebb78..e813105703 100644 --- 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 851d8954c8..88ca8938d2 100644 --- 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