You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ac...@apache.org on 2015/01/19 22:34:59 UTC
svn commit: r1653128 - /qpid/dispatch/branches/0.3/doc/man/CMakeLists.txt
Author: aconway
Date: Mon Jan 19 21:34:58 2015
New Revision: 1653128
URL: http://svn.apache.org/r1653128
Log:
NO-JIRA: Bug in man page generation, not checking for pandoc before generating HTML.
Modified:
qpid/dispatch/branches/0.3/doc/man/CMakeLists.txt
Modified: qpid/dispatch/branches/0.3/doc/man/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/dispatch/branches/0.3/doc/man/CMakeLists.txt?rev=1653128&r1=1653127&r2=1653128&view=diff
==============================================================================
--- qpid/dispatch/branches/0.3/doc/man/CMakeLists.txt (original)
+++ qpid/dispatch/branches/0.3/doc/man/CMakeLists.txt Mon Jan 19 21:34:58 2015
@@ -50,18 +50,18 @@ macro(manpage program section)
install(FILES ${manpage}.md DESTINATION ${QD_DOC_INSTALL_DIR})
set(MANPAGES_OUT ${MANPAGES_OUT} ${manpage}.md)
- # Generate HTML man page
- add_custom_command (
- OUTPUT ${manpage}.html ${manpage}.html.in
- DEPENDS ${manpage}.md
- COMMAND ${PANDOC} -f markdown -t html -o ${manpage}.html ${manpage}.md -s # Full page
- COMMAND ${PANDOC} -f markdown -t html -o ${manpage}.html.in ${manpage}.md # Fragment
- )
- install(FILES ${manpage}.html DESTINATION ${QD_DOC_INSTALL_DIR})
- set(MANPAGES_OUT ${MANPAGES_OUT} ${manpage}.html ${manpage}.html.in)
-
- # Generate proper man pages
if (PANDOC)
+ # Generate HTML man page
+ add_custom_command (
+ OUTPUT ${manpage}.html ${manpage}.html.in
+ DEPENDS ${manpage}.md
+ COMMAND ${PANDOC} -f markdown -t html -o ${manpage}.html ${manpage}.md -s # Full page
+ COMMAND ${PANDOC} -f markdown -t html -o ${manpage}.html.in ${manpage}.md # Fragment
+ )
+ install(FILES ${manpage}.html DESTINATION ${QD_DOC_INSTALL_DIR})
+ set(MANPAGES_OUT ${MANPAGES_OUT} ${manpage}.html ${manpage}.html.in)
+
+ # Generate proper man pages
string(TIMESTAMP date "%Y-%m-%d")
if(${section} EQUAL 8)
set(header "System Manager's Manual")
@@ -103,5 +103,4 @@ add_custom_command(
manpage(qdrouterd.conf 5)
# Target to build the generated files
-message("FIXME" ${MANPAGES_OUT})
add_custom_target(man ALL DEPENDS ${MANPAGES_OUT})
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org