nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-10 09:58:01 +00:00
Code Issues Projects Releases Wiki Activity

doc/CMakeLists.txt: reorganise custom targets.

Browse Source 
Jacob reported that on Debian buster, the command sequence

  cmake $srcdir
  cmake --build .
  cmake --build . --target doc

would fail at the third step, with the make error "No rule to make
target 'doc/cmake_version.but', needed by 'doc/html/index.html'".

That seems odd, because the file ${VERSION_BUT} _was_ declared as a
dependency of the rule that builds doc/html/*.html, and _cmake_ knew
what rule built it (namely the custom target 'cmake_version_but'). I
suspect this is a bug in cmake 3.13, because the same command sequence
works fine with cmake 3.20.

However, it's possible to work around, by means of adding the cmake
_target name_ to the dependencies for any rule that uses that file,
instead of relying on it to map the output _file_ name to that target.

While I'm at it, I've transformed the rules that build copy.but and
licence.but in the same way, turning those too into custom targets
instead of custom commands (I've found that the former are more
generally reliable across a range of cmake versions), and including
the target names themselves as dependencies.
This commit is contained in:
Simon Tatham 2022-01-22 14:42:03 +00:00
parent fafad1b8f6
commit cadd86ac49
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
doc/CMakeLists.txt
View File

@ -22,6 +22,9 @@ if(HALIBUT AND PERL_EXECUTABLE)
# If this is a source archive in which a fixed version.but was # If this is a source archive in which a fixed version.but was
# provided, use that. Otherwise, infer one from the git checkout (if # provided, use that. Otherwise, infer one from the git checkout (if
# possible). # possible).
set(manual_dependencies) # extra target names to depend on
if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/version.but) if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/version.but)
set(VERSION_BUT ${CMAKE_CURRENT_SOURCE_DIR}/version.but) set(VERSION_BUT ${CMAKE_CURRENT_SOURCE_DIR}/version.but)
else() else()
@ -43,16 +46,20 @@ if(HALIBUT AND PERL_EXECUTABLE)
${INTERMEDIATE_VERSION_BUT} ${VERSION_BUT} ${INTERMEDIATE_VERSION_BUT} ${VERSION_BUT}
DEPENDS check_git_commit_for_doc ${INTERMEDIATE_VERSION_BUT} DEPENDS check_git_commit_for_doc ${INTERMEDIATE_VERSION_BUT}
COMMENT "Updating cmake_version.but") COMMENT "Updating cmake_version.but")
set(manual_dependencies ${manual_dependencies} cmake_version_but)
endif() endif()
add_custom_command(OUTPUT copy.but add_custom_target(copy_but
BYPRODUCTS copy.but
COMMAND ${PERL_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/../licence.pl COMMAND ${PERL_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/../licence.pl
--copyrightdoc -o copy.but --copyrightdoc -o copy.but
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../licence.pl ${CMAKE_CURRENT_SOURCE_DIR}/../LICENCE) DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../licence.pl ${CMAKE_CURRENT_SOURCE_DIR}/../LICENCE)
add_custom_command(OUTPUT licence.but add_custom_target(licence_but
BYPRODUCTS licence.but
COMMAND ${PERL_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/../licence.pl COMMAND ${PERL_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/../licence.pl
--licencedoc -o licence.but --licencedoc -o licence.but
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../licence.pl ${CMAKE_CURRENT_SOURCE_DIR}/../LICENCE) DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../licence.pl ${CMAKE_CURRENT_SOURCE_DIR}/../LICENCE)
set(manual_dependencies ${manual_dependencies} copy_but licence_but)
set(manual_sources set(manual_sources
${CMAKE_CURRENT_BINARY_DIR}/copy.but ${CMAKE_CURRENT_BINARY_DIR}/copy.but
@ -83,7 +90,7 @@ if(HALIBUT AND PERL_EXECUTABLE)
add_custom_command(OUTPUT ${html_dir}/index.html add_custom_command(OUTPUT ${html_dir}/index.html
COMMAND ${HALIBUT} --html ${manual_sources} COMMAND ${HALIBUT} --html ${manual_sources}
WORKING_DIRECTORY ${html_dir} WORKING_DIRECTORY ${html_dir}
DEPENDS ${manual_sources}) DEPENDS ${manual_sources} ${manual_dependencies})
list(APPEND doc_outputs ${html_dir}/index.html) list(APPEND doc_outputs ${html_dir}/index.html)
# Windows help. # Windows help.
@ -92,14 +99,14 @@ if(HALIBUT AND PERL_EXECUTABLE)
add_custom_command(OUTPUT putty.chm add_custom_command(OUTPUT putty.chm
COMMAND ${HALIBUT} --chm chmextra.but ${manual_sources} COMMAND ${HALIBUT} --chm chmextra.but ${manual_sources}
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
DEPENDS ${manual_sources}) DEPENDS ${manual_sources} ${manual_dependencies})
list(APPEND doc_outputs putty.chm) list(APPEND doc_outputs putty.chm)
# Plain text. # Plain text.
add_custom_command(OUTPUT puttydoc.txt add_custom_command(OUTPUT puttydoc.txt
COMMAND ${HALIBUT} --text ${manual_sources} COMMAND ${HALIBUT} --text ${manual_sources}
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
DEPENDS ${manual_sources}) DEPENDS ${manual_sources} ${manual_dependencies})
list(APPEND doc_outputs puttydoc.txt) list(APPEND doc_outputs puttydoc.txt)
endif() endif()