Wireshark-commits: [Wireshark-commits] master aa9a0b3: cmake: fix sporadic WSDG build failure on Wi
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=aa9a0b3bf831395dc1cfbaea7f467faed952dbf9
Submitter: Anders Broman (a.broman58@xxxxxxxxx)
Changed: branch: master
Repository: wireshark
Commits:
aa9a0b3 by Peter Wu (peter@xxxxxxxxxxxxx):
cmake: fix sporadic WSDG build failure on Windows
The Windows builds (using msbuild) fail sporadically when building
documentation (target developer_guides). The problem is that the targets
"developer_guide_pdf_a4" and "developer_guide_html" both depend on
developer-guide.xml and msbuild does not notice that the file has
already been generated by the generate_developer-guide.xml target.
For a discussion of the problem, see
https://gitlab.kitware.com/cmake/cmake/issues/16767
To fix this, remove the "developer-guide.xml" dependency from
"developer_guide_xyz" (to prevent these targets from triggering building
"developer-guide.xml"). Instead, depend on a generated
"developer-guide.xml-stamp" file which is created by the
"generate_developer-guide.xml" target (but do *not* add it as output of
this target, otherwise we will have the original problem again).
This workaround is restricted to the MSVC generators because otherwise
it would trigger a CMP0058 policy warning when used with Ninja.
Change-Id: Idb3975cde35be2601b038a500d4886bbd3a684d7
Reviewed-on: https://code.wireshark.org/review/20812
Petri-Dish: Peter Wu <peter@xxxxxxxxxxxxx>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
Reviewed-by: Graham Bloice <graham.bloice@xxxxxxxxxxxxx>
Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
Actions performed:
from a71811a packet-wsp.c: Fix WSP dissector loop (add_capabilities)
adds aa9a0b3 cmake: fix sporadic WSDG build failure on Windows
Summary of changes:
cmake/modules/FindASCIIDOC.cmake | 12 ++++++++++++
cmake/modules/FindXSLTPROC.cmake | 40 ++++++++++++++++++++++++++++++++------
2 files changed, 46 insertions(+), 6 deletions(-)
