Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-12 21:18:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

[cmake] fix dependencies in documentation build

Browse source 
Closes two race conditions in parallel builds.
This commit is contained in:
David Adam 2018-03-24 21:28:27 +08:00
parent 0572b29f26
commit 46e9bf86b8
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cmake/Docs.cmake
View file

@ -68,8 +68,10 @@ IF(BUILD_DOCS)
DEPENDS ${FUNCTIONS_DIR_FILES} ${COMPLETIONS_DIR_FILES} DEPENDS ${FUNCTIONS_DIR_FILES} ${COMPLETIONS_DIR_FILES}
doc_src/commands.hdr ${CMAKE_CURRENT_SOURCE_DIR}/lexicon_filter.in doc_src/commands.hdr ${CMAKE_CURRENT_SOURCE_DIR}/lexicon_filter.in
share/functions/__fish_config_interactive.fish share/functions/__fish_config_interactive.fish
build_tools/build_lexicon_filter.sh) build_tools/build_lexicon_filter.sh command_list_toc.txt)
# Other targets should depend on this target, otherwise the lexicon
# filter can be built twice.
ADD_CUSTOM_TARGET(build_lexicon_filter DEPENDS lexicon_filter) ADD_CUSTOM_TARGET(build_lexicon_filter DEPENDS lexicon_filter)
# #
@ -127,7 +129,7 @@ IF(BUILD_DOCS)
ADD_CUSTOM_COMMAND(OUTPUT share/man/ ADD_CUSTOM_COMMAND(OUTPUT share/man/
COMMAND env `cat ${FBVF} | tr -d '\"' ` COMMAND env `cat ${FBVF} | tr -d '\"' `
INPUT_FILTER=lexicon_filter ${CMAKE_CURRENT_SOURCE_DIR}/build_tools/build_documentation.sh ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.help doc_src ./share INPUT_FILTER=lexicon_filter ${CMAKE_CURRENT_SOURCE_DIR}/build_tools/build_documentation.sh ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.help doc_src ./share
DEPENDS ${CFBVF} ${HELP_SRC} ${CMAKE_CURRENT_BINARY_DIR}/lexicon_filter) DEPENDS ${CFBVF} ${HELP_SRC} build_lexicon_filter)
ADD_CUSTOM_TARGET(BUILD_MANUALS ALL DEPENDS share/man/) ADD_CUSTOM_TARGET(BUILD_MANUALS ALL DEPENDS share/man/)