From 5e81643b5369cc4b0c2425ac48d8131dd4d387b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Wed, 24 Jan 2018 14:35:20 +0100 Subject: [PATCH] let doxygen decide what is MATHJAX_RELPATH by default --- Documentation/doc/CMakeLists.txt | 7 +++++-- Documentation/doc/resources/1.8.13/BaseDoxyfile.in | 2 +- Documentation/doc/resources/1.8.14/BaseDoxyfile.in | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Documentation/doc/CMakeLists.txt b/Documentation/doc/CMakeLists.txt index a5278699eb2..0ecafab9f7c 100644 --- a/Documentation/doc/CMakeLists.txt +++ b/Documentation/doc/CMakeLists.txt @@ -185,8 +185,11 @@ function(configure_doxygen_package CGAL_PACKAGE_NAME) endfunction() # set up the directories and variables -set(CGAL_DOC_MATHJAX_LOCATION "https://cdn.mathjax.org/mathjax/latest" - CACHE STRING "The location of MathJax to be used for the documentation.") +if (CGAL_DOC_MATHJAX_LOCATION) + set(CGAL_DOC_MATHJAX_LOCATION_FULL_OPTION_LINE "MATHJAX_RELPATH = ${CGAL_DOC_MATHJAX_LOCATION}") +else() + set(CGAL_DOC_MATHJAX_LOCATION "https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2") +endif() set(CGAL_DOC_OUTPUT_DIR "${CMAKE_BINARY_DIR}/doc_output") file(MAKE_DIRECTORY "${CGAL_DOC_OUTPUT_DIR}") diff --git a/Documentation/doc/resources/1.8.13/BaseDoxyfile.in b/Documentation/doc/resources/1.8.13/BaseDoxyfile.in index 63a39acfc3f..efdba539e5f 100644 --- a/Documentation/doc/resources/1.8.13/BaseDoxyfile.in +++ b/Documentation/doc/resources/1.8.13/BaseDoxyfile.in @@ -1571,7 +1571,7 @@ MATHJAX_FORMAT = HTML-CSS # The default value is: http://cdn.mathjax.org/mathjax/latest. # This tag requires that the tag USE_MATHJAX is set to YES. -MATHJAX_RELPATH = ${CGAL_DOC_MATHJAX_LOCATION} +${CGAL_DOC_MATHJAX_LOCATION_FULL_OPTION_LINE} # The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax # extension names that should be enabled during MathJax rendering. For example diff --git a/Documentation/doc/resources/1.8.14/BaseDoxyfile.in b/Documentation/doc/resources/1.8.14/BaseDoxyfile.in index ce2887146b3..3c639c179ce 100644 --- a/Documentation/doc/resources/1.8.14/BaseDoxyfile.in +++ b/Documentation/doc/resources/1.8.14/BaseDoxyfile.in @@ -1569,7 +1569,7 @@ MATHJAX_FORMAT = HTML-CSS # The default value is: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2/. # This tag requires that the tag USE_MATHJAX is set to YES. -MATHJAX_RELPATH = ${CGAL_DOC_MATHJAX_LOCATION} +${CGAL_DOC_MATHJAX_LOCATION_FULL_OPTION_LINE} # The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax # extension names that should be enabled during MathJax rendering. For example