diff options
| author | Gerald Combs <gerald@wireshark.org> | 2019-12-19 11:55:47 -0800 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2019-12-20 07:26:35 +0000 |
| commit | 6094e9d3922601f6c2eeb892c9bf5b46ff58ff5f (patch) | |
| tree | ef17d0fe17e85630f6aedb83b52f632380702cd3 /cmake | |
| parent | 1129114c55434e1c8eaa617ebc14cbedb5ea94d0 (diff) | |
CMake: Create a DocBook stamp file for Visual Studio.
Create user-guide.xml-stamp and developer-guide.xml-stamp when building
under Visual Studio. Fixes
C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\MSBuild\Microsoft\VC\v160\Microsoft.CppCommon.targets(231,5): warning MSB8064: Custom build for item "C:\buildbot\builders\wireshark-master-32\windows-2019-x86\build\cmbuild\CMakeFiles\8721ce5c0a51a8e0d8e35fd55fbe2e6e\user-guide.hhp.rule" succeeded, but specified dependency "c:\buildbot\builders\wireshark-master-32\windows-2019-x86\build\cmbuild\docbook\user-guide.xml-stamp" does not exist. This may cause incremental build to work incorrectly. [C:\buildbot\builders\wireshark-master-32\windows-2019-x86\build\cmbuild\docbook\user_guide_chm.vcxproj]
when building the user_guide_chm target.
Change-Id: Ia224823841b4d3def3436f9f3a48b759694ffb37
Reviewed-on: https://code.wireshark.org/review/35509
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/modules/FindAsciidoctor.cmake | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/cmake/modules/FindAsciidoctor.cmake b/cmake/modules/FindAsciidoctor.cmake index 7ffa193590..9cbab414cf 100644 --- a/cmake/modules/FindAsciidoctor.cmake +++ b/cmake/modules/FindAsciidoctor.cmake @@ -64,7 +64,17 @@ if(ASCIIDOCTOR_EXECUTABLE) ${CMAKE_CURRENT_SOURCE_DIR}/${_asciidocsource} ${ARGN} ) - add_custom_target(generate_${_output_xml} DEPENDS ${_output_xml}) + if(CMAKE_GENERATOR MATCHES "Visual Studio") + add_custom_command( + OUTPUT + ${_output_xml}-stamp + COMMAND ${CMAKE_COMMAND} -E touch ${_output_xml}-stamp + DEPENDS ${_output_xml} + ) + add_custom_target(generate_${_output_xml} DEPENDS ${_output_xml}-stamp) + else() + add_custom_target(generate_${_output_xml} DEPENDS ${_output_xml}) + endif() set_asciidoctor_target_properties(generate_${_output_xml}) unset(_output_xml) ENDMACRO() |