Commit 1c017190 authored by Hans Wennborg's avatar Hans Wennborg
Browse files

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
------------------------------------------------------------------------

llvm-svn: 245312
parent aebc639b

llvm/docs/CMake.rst

+4 −0
Original line number Diff line number Diff line
@@ -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.

llvm/docs/CMakeLists.txt

+9 −0
Original line number Diff line number Diff line
@@ -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

llvm/docs/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ $(PROJ_OBJ_DIR)/doxygen.cfg: doxygen.cfg.in 
	  -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

llvm/docs/doxygen.cfg.in

+1 −1
Original line number Diff line number Diff line
@@ -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.