aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlyuts <dioxinu@gmail.com>2016-01-05 23:00:31 -0800
committerJustin M. Keyes <justinkz@gmail.com>2016-02-03 01:43:12 -0500
commit4f4b8ea4489b445d0f9e0b8e1b9885555d0d861f (patch)
tree628d71aa4666b710615f347ee368ebd6754f3de7
parent8e92b7f9fce0a7eb5da0aab616dd8509ae4a0eb7 (diff)
downloadrneovim-4f4b8ea4489b445d0f9e0b8e1b9885555d0d861f.tar.gz
rneovim-4f4b8ea4489b445d0f9e0b8e1b9885555d0d861f.tar.bz2
rneovim-4f4b8ea4489b445d0f9e0b8e1b9885555d0d861f.zip
CMake: Avoid dependency cycles in helptags targets. #3983
Declare dependency in terms of directory, rather than individual doc files to avoid target dependency cycles. This still maintains install targets at doc file level.
-rw-r--r--runtime/CMakeLists.txt11
1 files changed, 4 insertions, 7 deletions
diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt
index ef8e38b553..4a90c11734 100644
--- a/runtime/CMakeLists.txt
+++ b/runtime/CMakeLists.txt
@@ -26,15 +26,12 @@ foreach(DF ${DOCFILES})
list(APPEND BUILDDOCFILES ${GENERATED_RUNTIME_DIR}/doc/${F})
endforeach()
-add_custom_command(OUTPUT ${BUILDDOCFILES}
- COMMAND ${CMAKE_COMMAND} -E copy_directory
+add_custom_command(OUTPUT copy_docfiles
+ COMMAND ${CMAKE_COMMAND} -E copy_directory
${PROJECT_SOURCE_DIR}/runtime/doc ${GENERATED_RUNTIME_DIR}/doc
- DEPENDS
- ${DOCFILES})
+)
add_custom_command(OUTPUT ${GENERATED_HELP_TAGS}
- COMMAND ${CMAKE_COMMAND} -E copy_directory
- ${PROJECT_SOURCE_DIR}/runtime/doc ${GENERATED_RUNTIME_DIR}/doc
COMMAND "${PROJECT_BINARY_DIR}/bin/nvim"
-u NONE
-i NONE
@@ -43,7 +40,7 @@ add_custom_command(OUTPUT ${GENERATED_HELP_TAGS}
-c "helptags ++t ."
-c quit
DEPENDS
- ${BUILDDOCFILES}
+ copy_docfiles
nvim
WORKING_DIRECTORY "${GENERATED_RUNTIME_DIR}/doc"
)