Author: hans Date: Tue Aug 18 11:50:24 2015 New Revision: 245313 URL: http://llvm.org/viewvc/llvm-project?rev=245313&view=rev Log: 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 ------------------------------------------------------------------------ Modified: cfe/branches/release_37/ (props changed) cfe/branches/release_37/docs/CMakeLists.txt cfe/branches/release_37/docs/Makefile cfe/branches/release_37/docs/doxygen.cfg.in Propchange: cfe/branches/release_37/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Aug 18 11:50:24 2015 @@ -1,4 +1,4 @@ /cfe/branches/type-system-rewrite:134693-134817 -/cfe/trunk:242244,242285,242293,242297,242313,242382,242422,242499,242574,242600,242660,242662,242667,242678,242766,242854,242905,242973,243018,243048,243085,243098,243101,243105,243133,243144,243153,243196,243206,243277,243280,243285,243289,243343,243417,243463,243538,243594,243642-243644,243851,243945-243950,243964,244000,244193,244468,244502,244719,244794,245041 +/cfe/trunk:242244,242285,242293,242297,242313,242382,242422,242499,242574,242600,242660,242662,242667,242678,242766,242854,242905,242973,243018,243048,243085,243098,243101,243105,243133,243144,243153,243196,243206,243277,243280,243285,243289,243343,243417,243463,243538,243594,243642-243644,243851,243945-243950,243964,244000,244193,244468,244502,244719,244794,245041,245259 /cfe/trunk/test:170344 /cfe/trunk/test/SemaTemplate:126920 Modified: cfe/branches/release_37/docs/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_37/docs/CMakeLists.txt?rev=245313&r1=245312&r2=245313&view=diff ============================================================================== --- cfe/branches/release_37/docs/CMakeLists.txt (original) +++ cfe/branches/release_37/docs/CMakeLists.txt Tue Aug 18 11:50:24 2015 @@ -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 Modified: cfe/branches/release_37/docs/Makefile URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_37/docs/Makefile?rev=245313&r1=245312&r2=245313&view=diff ============================================================================== --- cfe/branches/release_37/docs/Makefile (original) +++ cfe/branches/release_37/docs/Makefile Tue Aug 18 11:50:24 2015 @@ -30,6 +30,7 @@ $(PROJ_OBJ_DIR)/doxygen.cfg: doxygen.cfg -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 Modified: cfe/branches/release_37/docs/doxygen.cfg.in URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_37/docs/doxygen.cfg.in?rev=245313&r1=245312&r2=245313&view=diff ============================================================================== --- cfe/branches/release_37/docs/doxygen.cfg.in (original) +++ cfe/branches/release_37/docs/doxygen.cfg.in Tue Aug 18 11:50:24 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. _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
