[prev in list] [next in list] [prev in thread] [next in thread] 

List:       xalan-cvs
Subject:    [xalan-c] branch master updated: XALANC-792: Doxygen tagfile only used if present
From:       rleigh () apache ! org
Date:       2020-05-16 21:34:44
Message-ID: 158966488493.15195.17805704611442843900 () gitbox ! apache ! org
[Download RAW message or body]

This is an automated email from the ASF dual-hosted git repository.

rleigh pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/xalan-c.git


The following commit(s) were added to refs/heads/master by this push:
     new 04e05a3  XALANC-792: Doxygen tagfile only used if present
     new 56da7e8  Merge pull request #20 from \
rleigh-codelibre/XALANC-792_replace_stylebook_documentation_pt3 04e05a3 is described \
below

commit 04e05a3f8d3087ec5f178ae1df5da1d308df4eaf
Author: Roger Leigh <rleigh@codelibre.net>
AuthorDate: Wed May 13 13:40:29 2020 +0100

    XALANC-792: Doxygen tagfile only used if present
---
 docs/doxygen/CMakeLists.txt | 3 +++
 docs/doxygen/api.dox.in     | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/doxygen/CMakeLists.txt b/docs/doxygen/CMakeLists.txt
index eb34102..74c485d 100644
--- a/docs/doxygen/CMakeLists.txt
+++ b/docs/doxygen/CMakeLists.txt
@@ -28,6 +28,9 @@ if(BUILD_DOXYGEN)
   set(XERCESC_DOXYGEN_TAGFILE "${XERCESC_TAGFILE_DEFAULT}" CACHE STRING "Tagfile for \
xerces-c documentation")  set(XERCESC_DOXYGEN_HTML_LOCATION "${XERCESC_HTML_DEFAULT}" \
CACHE STRING "Base directory for xerces-c HTML documentation")  
+  if(EXISTS "${XERCESC_DOXYGEN_TAGFILE}")
+    set(DOXYGEN_XERCESC_TAGFILE \
"${XERCESC_DOXYGEN_TAGFILE}=${XERCESC_DOXYGEN_HTML_LOCATION}") +  endif()
   configure_file(${DOXYFILE_TEMPLATE} ${DOXYFILE} @ONLY)
 
   add_custom_command(OUTPUT ${DOXYGEN_LOG}
diff --git a/docs/doxygen/api.dox.in b/docs/doxygen/api.dox.in
index cb9aa12..f693eeb 100644
--- a/docs/doxygen/api.dox.in
+++ b/docs/doxygen/api.dox.in
@@ -2198,7 +2198,7 @@ SKIP_FUNCTION_MACROS   = YES
 # the path). If a tag file is not located in the directory in which doxygen is
 # run, you must also specify the path to the tagfile here.
 
-TAGFILES               = "@XALANC_DOXYGEN_TAGFILE@=@XALANC_DOXYGEN_HTML_LOCATION@"
+TAGFILES               = "@DOXYGEN_XERCESC_TAGFILE@"
 
 # When a file name is specified after GENERATE_TAGFILE, doxygen will create a
 # tag file that is based on the input files it reads. See section "Linking to


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xalan.apache.org
For additional commands, e-mail: commits-help@xalan.apache.org


[prev in list] [next in list] [prev in thread] [next in thread]