mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-06 09:56:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: allow to skip treesitter C parser install

Browse Source 
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.
This commit is contained in:
Matthieu Coudron
2020-02-07 17:47:58 +01:00
parent 120a4c8e25
commit 712298e1d3
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/nvim/CMakeLists.txt
View File

@@ -546,7 +546,11 @@ else()
endif() endif()
set_target_properties(nvim_runtime_deps PROPERTIES FOLDER deps) 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/ install(DIRECTORY ${PROJECT_BINARY_DIR}/lib/nvim/
DESTINATION ${CMAKE_INSTALL_LIBDIR}/nvim/ DESTINATION ${CMAKE_INSTALL_LIBDIR}/nvim/
USE_SOURCE_PERMISSIONS) USE_SOURCE_PERMISSIONS)

2
third-party/cmake/BuildTreesitterParsers.cmake vendored
View File

@@ -1,6 +1,6 @@
ExternalProject_Add(treesitter-c ExternalProject_Add(treesitter-c
PREFIX ${DEPS_BUILD_DIR} PREFIX ${DEPS_BUILD_DIR}
URL ${TREESITER_C_URL} URL ${TREESITTER_C_URL}
DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}/treesitter-c DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}/treesitter-c
DOWNLOAD_COMMAND ${CMAKE_COMMAND} DOWNLOAD_COMMAND ${CMAKE_COMMAND}
-DPREFIX=${DEPS_BUILD_DIR} -DPREFIX=${DEPS_BUILD_DIR}