Merge pull request #279 from KingDuckZ/master

Use tidy.xsl from documentation/ instead of build/documentation.
This commit is contained in:
Geoff McLane 2015-09-30 16:28:45 +02:00
commit 67192ba77e
2 changed files with 6 additions and 2 deletions

View file

@ -213,10 +213,14 @@ if (UNIX)
## also could use `manpath` command output to determine target install path ## also could use `manpath` command output to determine target install path
set(TIDY_MANFILE ${LIB_NAME}.1) set(TIDY_MANFILE ${LIB_NAME}.1)
message(STATUS "*** Generating man ${TIDY_MANFILE} custom commands...") message(STATUS "*** Generating man ${TIDY_MANFILE} custom commands...")
set(TIDY1XSL ${CMAKE_CURRENT_SOURCE_DIR}/build/documentation/tidy1.xsl) set(TIDY1XSL ${CMAKE_CURRENT_BINARY_DIR}/documentation/tidy1.xsl)
set(TIDYHELP ${CMAKE_CURRENT_BINARY_DIR}/tidy-help.xml) set(TIDYHELP ${CMAKE_CURRENT_BINARY_DIR}/tidy-help.xml)
set(TIDYCONFIG ${CMAKE_CURRENT_BINARY_DIR}/tidy-config.xml) set(TIDYCONFIG ${CMAKE_CURRENT_BINARY_DIR}/tidy-config.xml)
add_custom_target(man ALL DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/${LIB_NAME}") add_custom_target(man ALL DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/${LIB_NAME}")
configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/documentation/tidy1.xsl.in
${TIDY1XSL}
)
# run built EXE to generate xml output # run built EXE to generate xml output
add_custom_command( add_custom_command(

View file

@ -24,7 +24,7 @@
the $CONFIG variable, declared here: the $CONFIG variable, declared here:
--> -->
<xsl:variable name="CONFIG" select="document('tidy-config.xml')"/> <xsl:variable name="CONFIG" select="document('@TIDYCONFIG@')"/>
<!-- Main Template: --> <!-- Main Template: -->