aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Hahler <github@thequod.de>2019-01-01 13:56:20 +0100
committerJustin M. Keyes <justinkz@gmail.com>2019-01-01 13:56:20 +0100
commit24f2cc55a83dc841acf4c8714ad250a735bb38dc (patch)
treed7f5389bb5268be2f289396d27b3d50a3135b08d
parent3340e08becbfcc4d6bcbd1aa28e37076ca2f7723 (diff)
downloadrneovim-24f2cc55a83dc841acf4c8714ad250a735bb38dc.tar.gz
rneovim-24f2cc55a83dc841acf4c8714ad250a735bb38dc.tar.bz2
rneovim-24f2cc55a83dc841acf4c8714ad250a735bb38dc.zip
cmake: runtime: use add_custom_command for tags directly (#9430)
This avoids generating the tags files all the time, and makes `make install` with `CMAKE_INSTALL_MESSAGE=LAZY` much more silent in general. Using `copy_if_different` instead of `remove` + `copy_directory` might be good on top, but is a) not really necessary anymore and b) would not sync removed files. For this `file(COPY` could be used, but would require to re-run cmake on changed input files then.
-rw-r--r--runtime/CMakeLists.txt17
1 files changed, 4 insertions, 13 deletions
diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt
index ad706af087..f3bfd786ad 100644
--- a/runtime/CMakeLists.txt
+++ b/runtime/CMakeLists.txt
@@ -29,21 +29,16 @@ foreach(PACKAGE ${PACKAGES})
file(GLOB "${PACKNAME}_DOC_FILES" ${PACKAGE}/doc/*.txt)
if(${PACKNAME}_DOC_FILES)
file(MAKE_DIRECTORY ${GENERATED_PACKAGE_DIR}/${PACKNAME})
- add_custom_target("${PACKNAME}-tags"
+ add_custom_command(OUTPUT "${GENERATED_PACKAGE_DIR}/${PACKNAME}/doc/tags"
COMMAND ${CMAKE_COMMAND} -E copy_directory
${PACKAGE} ${GENERATED_PACKAGE_DIR}/${PACKNAME}
COMMAND "${PROJECT_BINARY_DIR}/bin/nvim"
-u NONE -i NONE -e --headless -c "helptags doc" -c quit
DEPENDS
nvim
+ nvim_runtime_deps
WORKING_DIRECTORY "${GENERATED_PACKAGE_DIR}/${PACKNAME}"
)
- add_dependencies(${PACKNAME}-tags nvim_runtime_deps)
-
- add_custom_command(OUTPUT "${GENERATED_PACKAGE_DIR}/${PACKNAME}/doc/tags"
- DEPENDS
- "${PACKNAME}-tags"
- )
set("${PACKNAME}_DOC_NAMES")
foreach(DF "${${PACKNAME}_DOC_FILES}")
@@ -67,7 +62,7 @@ foreach(DF ${DOCFILES})
list(APPEND BUILDDOCFILES ${GENERATED_RUNTIME_DIR}/doc/${F})
endforeach()
-add_custom_target(helptags
+add_custom_command(OUTPUT ${GENERATED_HELP_TAGS}
COMMAND ${CMAKE_COMMAND} -E remove doc/*
COMMAND ${CMAKE_COMMAND} -E copy_directory
${PROJECT_SOURCE_DIR}/runtime/doc doc
@@ -75,14 +70,10 @@ add_custom_target(helptags
-u NONE -i NONE -e --headless -c "helptags ++t doc" -c quit
DEPENDS
nvim
+ nvim_runtime_deps
WORKING_DIRECTORY "${GENERATED_RUNTIME_DIR}"
)
-add_dependencies(helptags nvim_runtime_deps)
-add_custom_command(OUTPUT ${GENERATED_HELP_TAGS}
- DEPENDS
- helptags
-)
add_custom_target(doc_html
COMMAND make html