diff options
| author | Graham Bloice <graham.bloice@trihedral.com> | 2016-01-09 23:17:41 +0000 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2016-01-10 07:04:11 +0000 |
| commit | 25bfbaa0cf8170d99e36accf1deb77e25789cd7c (patch) | |
| tree | 44198c734fe57be2b24b411cb75af0d18d913d2e /cmake | |
| parent | 9c3044e1641a72b5c2b7b0959f28d9600c39f62a (diff) | |
CMake: Fix docbook dependencies
unset accumulator variables after use so that successive uses are
not carried forward.
add MAIN_DEPENDENCY for chm generation so that it is correctly
rebuilt when the sources change.
Change-Id: I3b0c47a775f398346cc3a3bbd39d4fab2b0ec000
Reviewed-on: https://code.wireshark.org/review/13160
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
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 | 9 | ||||
| -rw-r--r-- | cmake/modules/FindXSLTPROC.cmake | 1 |
2 files changed, 10 insertions, 0 deletions
diff --git a/cmake/modules/FindASCIIDOC.cmake b/cmake/modules/FindASCIIDOC.cmake index a0d89ae62d..dc272baca9 100644 --- a/cmake/modules/FindASCIIDOC.cmake +++ b/cmake/modules/FindASCIIDOC.cmake @@ -107,6 +107,9 @@ MACRO( ASCIIDOC2DOCBOOK _asciidocsource _conf_files _src_files _built_deps ) ${_src_deps} ${${_built_deps}} ) + unset(_src_deps) + unset(_conf_deps) + unset(_conf_opts_list) ENDMACRO() MACRO( ASCIIDOC2HTML _output _asciidocsource _conf_files ) @@ -149,6 +152,8 @@ MACRO( ASCIIDOC2HTML _output _asciidocsource _conf_files ) ${_conf_deps} ${_otherdependencies} ) + unset(_conf_deps) + unset(_conf_opts_list) ENDMACRO() MACRO( ASCIIDOC2TXT _output _asciidocsource _conf_files ) @@ -196,6 +201,8 @@ MACRO( ASCIIDOC2TXT _output _asciidocsource _conf_files ) ${_asciidocsource} ${_conf_deps} ) + unset(_conf_deps) + unset(_conf_opts_list) ENDMACRO() # news: release-notes.txt @@ -241,4 +248,6 @@ MACRO( ASCIIDOC2PDF _output _asciidocsource _conf_files _paper ) ${_conf_deps} ${_otherdependencies} ) + unset(_conf_deps) + unset(_conf_opts_list) ENDMACRO() diff --git a/cmake/modules/FindXSLTPROC.cmake b/cmake/modules/FindXSLTPROC.cmake index 6b660fa7ee..8c5d35f447 100644 --- a/cmake/modules/FindXSLTPROC.cmake +++ b/cmake/modules/FindXSLTPROC.cmake @@ -216,6 +216,7 @@ MACRO(XML2HHP _target_dep _guide _docbooksource) --stringparam admon.graphics.path ${_gfxdir}/ --nonet custom_layer_chm.xsl ${_docbook_plain_title} + MAIN_DEPENDENCY ${_docbooksource} DEPENDS ${_dbk_dep} # AsciiDoc uses UTF-8 by default, which is unsupported by HTML |