diff options
| author | Björn Linse <bjorn.linse@gmail.com> | 2020-02-10 23:32:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-10 23:32:47 +0100 |
| commit | e14fae81e92936d87cbb0b1b1da2a057bcf9b62a (patch) | |
| tree | 228d086866a6b269f214fa2546677d50c7c78f65 | |
| parent | a723d605490567c9e9cf961aa85b80e8a729db1e (diff) | |
| parent | 3f217741ec84162383456468e6782a1859130d3c (diff) | |
| download | rneovim-e14fae81e92936d87cbb0b1b1da2a057bcf9b62a.tar.gz rneovim-e14fae81e92936d87cbb0b1b1da2a057bcf9b62a.tar.bz2 rneovim-e14fae81e92936d87cbb0b1b1da2a057bcf9b62a.zip | |
Merge pull request #11848 from fwalch/build-tree-sitter-out-of-source
Build tree-sitter-c out-of-source
| -rw-r--r-- | third-party/cmake/BuildTreesitterParsers.cmake | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/third-party/cmake/BuildTreesitterParsers.cmake b/third-party/cmake/BuildTreesitterParsers.cmake index ccc81ae97b..5284a7fd62 100644 --- a/third-party/cmake/BuildTreesitterParsers.cmake +++ b/third-party/cmake/BuildTreesitterParsers.cmake @@ -10,19 +10,18 @@ DOWNLOAD_COMMAND ${CMAKE_COMMAND} -DTARGET=treesitter-c -DUSE_EXISTING_SRC_DIR=${USE_EXISTING_SRC_DIR} -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/DownloadAndExtractFile.cmake -BUILD_IN_SOURCE 1 -CONFIGURE_COMMAND ${CMAKE_COMMAND} -E copy +PATCH_COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/cmake/TreesitterParserCMakeLists.txt ${DEPS_BUILD_DIR}/src/treesitter-c/CMakeLists.txt - COMMAND ${CMAKE_COMMAND} ${DEPS_BUILD_DIR}/src/treesitter-c/CMakeLists.txt - -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} - -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} - -DCMAKE_GENERATOR=${CMAKE_GENERATOR} - -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} - -DCMAKE_INSTALL_PREFIX=${DEPS_INSTALL_DIR} - # Pass toolchain - -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} - -DPARSERLANG=c +CMAKE_ARGS + -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} + -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} + -DCMAKE_GENERATOR=${CMAKE_GENERATOR} + -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} + -DCMAKE_INSTALL_PREFIX=${DEPS_INSTALL_DIR} + # Pass toolchain + -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} + -DPARSERLANG=c BUILD_COMMAND ${CMAKE_COMMAND} --build . --config ${CMAKE_BUILD_TYPE} INSTALL_COMMAND ${CMAKE_COMMAND} --build . --target install --config ${CMAKE_BUILD_TYPE}) |