Merging r245259:

------------------------------------------------------------------------
r245259 | hans | 2015-08-17 16:38:56 -0700 (Mon, 17 Aug 2015) | 3 lines

Doxygen: add build option to use svg instead of png files for graphs

Differential Revision: http://reviews.llvm.org/D11994
------------------------------------------------------------------------

git-svn-id: https://llvm.org/svn/llvm-project/cfe/branches/release_37@245313 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
index 47bb2e0c4b9972f40da48f28c282555c0f1d4c35..f42439a9bf1c5ba31201acfb7b0bacfe6e5cd69f 100644 (file)
--- a/docs/CMakeLists.txt
+++ b/docs/CMakeLists.txt
@@ -47,6 +47,14 @@ if (LLVM_ENABLE_DOXYGEN)
     set(clang_doxygen_qhp_cust_filter_attrs "")
   endif()
 
+  option(LLVM_DOXYGEN_SVG
+    "Use svg instead of png files for doxygen graphs." OFF)
+  if (LLVM_DOXYGEN_SVG)
+    set(DOT_IMAGE_FORMAT "svg")
+  else()
+    set(DOT_IMAGE_FORMAT "png")
+  endif()
+
   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/doxygen.cfg.in
     ${CMAKE_CURRENT_BINARY_DIR}/doxygen.cfg @ONLY)
 
@@ -64,6 +72,7 @@ if (LLVM_ENABLE_DOXYGEN)
   set(clang_doxygen_qhelpgenerator_path)
   set(clang_doxygen_qhp_cust_filter_name)
   set(clang_doxygen_qhp_cust_filter_attrs)
+  set(DOT_IMAGE_FORMAT)
 
   add_custom_target(doxygen-clang
     COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/doxygen.cfg

diff --git a/docs/Makefile b/docs/Makefile
index a409cf6025bdfefc2237ab344ffc08d5f0f559b5..a6c6e6c43be410a4cb7dd1cc41cff3e330d8e6eb 100644 (file)
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -30,6 +30,7 @@ $(PROJ_OBJ_DIR)/doxygen.cfg: doxygen.cfg.in
          -e 's/@enable_server_based_search@/NO/g' \
          -e 's/@extra_search_mappings@//g' \
          -e 's/@searchengine_url@//g' \
+         -e 's/@DOT_IMAGE_FORMAT@/png/g' \
          > $@
 endif
 

diff --git a/docs/doxygen.cfg.in b/docs/doxygen.cfg.in
index 39c9aed57e01de6498a09c4ec75430f9e17518d6..b4cfbbdf7f42783460c1cd0351e6d8d12fa24700 100644 (file)
--- a/docs/doxygen.cfg.in
+++ b/docs/doxygen.cfg.in
@@ -2205,7 +2205,7 @@ DIRECTORY_GRAPH        = YES
 # The default value is: png.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-DOT_IMAGE_FORMAT       = png
+DOT_IMAGE_FORMAT       = @DOT_IMAGE_FORMAT@
 
 # If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
 # enable generation of interactive SVG images that allow zooming and panning.