IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11830 from teto/treesitter_fix

Browse Source 
build: allow to use non-bundled C parser
This commit is contained in:
Björn Linse 2020-02-07 21:55:43 +01:00 committed by GitHub
commit 1f479fffbf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show Stats 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()
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)

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

@ -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}