Commit 4f6d9e98 authored by Hans Wennborg's avatar Hans Wennborg
Browse files

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

llvm-svn: 245313
parent 1c017190

clang/docs/CMakeLists.txt

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

clang/docs/Makefile

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

clang/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.