From 712298e1d3a8567b9857fa90beaa76e8922452c5 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Fri, 7 Feb 2020 17:47:58 +0100 Subject: [PATCH] build: allow to skip treesitter C parser install if USE_BUNDLED_TS_PARSERS is set to off, don't try to install the parser. Distribs can install treesitter parsers directly into $CMAKE_LIBRARY_PATH/nvim (and users anywhere in rtp). Also fix the URL. --- src/nvim/CMakeLists.txt | 6 +++++- third-party/cmake/BuildTreesitterParsers.cmake | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt index 29427c7d08..b2ae3a814d 100644 --- a/src/nvim/CMakeLists.txt +++ b/src/nvim/CMakeLists.txt @@ -546,7 +546,11 @@ else() endif() set_target_properties(nvim_runtime_deps PROPERTIES FOLDER deps) -file(COPY ${DEPS_PREFIX}/lib/nvim/parser DESTINATION ${PROJECT_BINARY_DIR}/lib/nvim/) +# install treesitter parser if bundled +if(EXISTS ${DEPS_PREFIX}/lib/nvim/parser) + file(COPY ${DEPS_PREFIX}/lib/nvim/parser DESTINATION ${PROJECT_BINARY_DIR}/lib/nvim/) +endif() + install(DIRECTORY ${PROJECT_BINARY_DIR}/lib/nvim/ DESTINATION ${CMAKE_INSTALL_LIBDIR}/nvim/ USE_SOURCE_PERMISSIONS) diff --git a/third-party/cmake/BuildTreesitterParsers.cmake b/third-party/cmake/BuildTreesitterParsers.cmake index 690a8fbed1..ccc81ae97b 100644 --- a/third-party/cmake/BuildTreesitterParsers.cmake +++ b/third-party/cmake/BuildTreesitterParsers.cmake @@ -1,6 +1,6 @@ ExternalProject_Add(treesitter-c PREFIX ${DEPS_BUILD_DIR} -URL ${TREESITER_C_URL} +URL ${TREESITTER_C_URL} DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}/treesitter-c DOWNLOAD_COMMAND ${CMAKE_COMMAND} -DPREFIX=${DEPS_BUILD_DIR}