diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2016-02-26 01:03:45 +0100 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2016-02-26 19:52:09 +0000 |
| commit | d544ecd0ec849202a17c7d6d9d92948a8f59c596 (patch) | |
| tree | 926293a826b5111af88b44060fa36dc4f912e0fd /cmake | |
| parent | 4c3a6a8ef4cd12aec245429f084e4c7b60db70a4 (diff) | |
cmake: fix parallel docbook build
Let targets depend on the generate_developer-guide.xml target instead of
the developer-guide.xml output file.
Change-Id: I66106ad69c9baedbd58a008b4dbbbf93b787c2c2
Reviewed-on: https://code.wireshark.org/review/14156
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/modules/FindASCIIDOC.cmake | 3 | ||||
| -rw-r--r-- | cmake/modules/FindXSLTPROC.cmake | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/cmake/modules/FindASCIIDOC.cmake b/cmake/modules/FindASCIIDOC.cmake index dc272baca9..ae3a474d3c 100644 --- a/cmake/modules/FindASCIIDOC.cmake +++ b/cmake/modules/FindASCIIDOC.cmake @@ -85,7 +85,7 @@ MACRO( ASCIIDOC2DOCBOOK _asciidocsource _conf_files _src_files _built_deps ) TO_A2X_COMPATIBLE_PATH ( ${CMAKE_CURRENT_SOURCE_DIR}/${_asciidocsource} _a2x_asciidocsource ) - ADD_CUSTOM_COMMAND( + add_custom_command( OUTPUT ${_output_xml} # XXX - Output to a specific directory, e.g. wsdg_generated_src @@ -107,6 +107,7 @@ MACRO( ASCIIDOC2DOCBOOK _asciidocsource _conf_files _src_files _built_deps ) ${_src_deps} ${${_built_deps}} ) + add_custom_target(generate_${_output_xml} DEPENDS ${_output_xml}) unset(_src_deps) unset(_conf_deps) unset(_conf_opts_list) diff --git a/cmake/modules/FindXSLTPROC.cmake b/cmake/modules/FindXSLTPROC.cmake index 5f851c7239..6b3b71df4a 100644 --- a/cmake/modules/FindXSLTPROC.cmake +++ b/cmake/modules/FindXSLTPROC.cmake @@ -127,7 +127,7 @@ MACRO(XML2HTML _target_dep _dir_pfx _mode _dbk_source _gfx_sources) ${_STYLESHEET} ${_dbk_source} DEPENDS - ${_dbk_source} + generate_${_dbk_source} ${_dbk_dep} #${_validated} ${_gfx_deps} @@ -173,7 +173,7 @@ MACRO(XML2PDF _target_dep _output _dbk_source _stylesheet _paper) ${_output}.fo ${_output} DEPENDS - ${_dbk_source} + generate_${_dbk_source} ${_dbk_dep} ${_stylesheet} ) @@ -219,7 +219,7 @@ MACRO(XML2HHP _target_dep _guide _docbooksource) --nonet custom_layer_chm.xsl ${_docbook_plain_title} DEPENDS - ${_docbooksource} + generate_${_docbooksource} ${_dbk_dep} # AsciiDoc uses UTF-8 by default, which is unsupported by HTML # Help. We may want to render an ISO-8859-1 version, or get rid |