[llvm-branch-commits] [llvm-branch] r245312 - Merging r245256:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Tue Aug 18 11:48:44 2015
New Revision: 245312

URL: http://llvm.org/viewvc/llvm-project?rev=245312&view=rev
Log:
Merging r245256:
------------------------------------------------------------------------
r245256 | hans | 2015-08-17 16:24:17 -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
------------------------------------------------------------------------

Modified:
    llvm/branches/release_37/   (props changed)
    llvm/branches/release_37/docs/CMake.rst
    llvm/branches/release_37/docs/CMakeLists.txt
    llvm/branches/release_37/docs/Makefile
    llvm/branches/release_37/docs/doxygen.cfg.in

Propchange: llvm/branches/release_37/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 18 11:48:44 2015
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,242236,242239,242281,242288,242296,242331,242341,242410,242412,242433-242434,242442,242543,242673,242680,242706,242721-242722,242733-242735,242742,242869,242919,242993,243001,243057,243116,243263,243294,243361,243469,243485,243500,243519,243531,243589,243609,243636,243638-243640,243745,243891,243898,243927,243932,243934,243984,243986,243999,244058,244123,244232,244332,244418,244554,244644,244659,244676,244789,244889,245064,245105
+/llvm/trunk:155241,242236,242239,242281,242288,242296,242331,242341,242410,242412,242433-242434,242442,242543,242673,242680,242706,242721-242722,242733-242735,242742,242869,242919,242993,243001,243057,243116,243263,243294,243361,243469,243485,243500,243519,243531,243589,243609,243636,243638-243640,243745,243891,243898,243927,243932,243934,243984,243986,243999,244058,244123,244232,244332,244418,244554,244644,244659,244676,244789,244889,245064,245105,245256

Modified: llvm/branches/release_37/docs/CMake.rst
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_37/docs/CMake.rst?rev=245312&r1=245311&r2=245312&view=diff
==============================================================================
--- llvm/branches/release_37/docs/CMake.rst (original)
+++ llvm/branches/release_37/docs/CMake.rst Tue Aug 18 11:48:44 2015
@@ -387,6 +387,10 @@ LLVM-specific variables
   ``-DLLVM_ENABLE_DOXYGEN_QT_HELP=ON``; otherwise this has no
   effect.
 
+**LLVM_DOXYGEN_SVG**:BOOL
+  Uses .svg files instead of .png files for graphs in the Doxygen output.
+  Defaults to OFF.
+
 **LLVM_ENABLE_SPHINX**:BOOL
   If enabled CMake will search for the ``sphinx-build`` executable and will make
   the ``SPHINX_OUTPUT_HTML`` and ``SPHINX_OUTPUT_MAN`` CMake options available.

Modified: llvm/branches/release_37/docs/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_37/docs/CMakeLists.txt?rev=245312&r1=245311&r2=245312&view=diff
==============================================================================
--- llvm/branches/release_37/docs/CMakeLists.txt (original)
+++ llvm/branches/release_37/docs/CMakeLists.txt Tue Aug 18 11:48:44 2015
@@ -56,6 +56,14 @@ if (LLVM_ENABLE_DOXYGEN)
     set(llvm_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)
 
@@ -73,6 +81,7 @@ if (LLVM_ENABLE_DOXYGEN)
   set(llvm_doxygen_qhelpgenerator_path)
   set(llvm_doxygen_qhp_cust_filter_name)
   set(llvm_doxygen_qhp_cust_filter_attrs)
+  set(DOT_IMAGE_FORMAT)
 
   add_custom_target(doxygen-llvm
     COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/doxygen.cfg

Modified: llvm/branches/release_37/docs/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_37/docs/Makefile?rev=245312&r1=245311&r2=245312&view=diff
==============================================================================
--- llvm/branches/release_37/docs/Makefile (original)
+++ llvm/branches/release_37/docs/Makefile Tue Aug 18 11:48:44 2015
@@ -31,6 +31,7 @@ $(PROJ_OBJ_DIR)/doxygen.cfg: doxygen.cfg
 	  -e 's/@llvm_doxygen_qhp_cust_filter_name@//g' \
 	  -e 's/@llvm_doxygen_qhp_namespace@//g' \
 	  -e 's/@searchengine_url@//g' \
+	  -e 's/@DOT_IMAGE_FORMAT@/png/g' \
 	  > $@
 endif
 

Modified: llvm/branches/release_37/docs/doxygen.cfg.in
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_37/docs/doxygen.cfg.in?rev=245312&r1=245311&r2=245312&view=diff
==============================================================================
--- llvm/branches/release_37/docs/doxygen.cfg.in (original)
+++ llvm/branches/release_37/docs/doxygen.cfg.in Tue Aug 18 11:48:44 2015
@@ -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.