diff options
| author | dundargoc <33953936+dundargoc@users.noreply.github.com> | 2023-01-24 16:43:29 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-24 16:43:29 +0100 |
| commit | cd613712b1a8db233f95f173333b46ebd9df7c9f (patch) | |
| tree | 7844a6c7e761e8684eea527599b2da1b420ea9e6 | |
| parent | 51863b2d66bc5b2420a56959d0fcdbdb8a1e993e (diff) | |
| download | rneovim-cd613712b1a8db233f95f173333b46ebd9df7c9f.tar.gz rneovim-cd613712b1a8db233f95f173333b46ebd9df7c9f.tar.bz2 rneovim-cd613712b1a8db233f95f173333b46ebd9df7c9f.zip | |
build: use cmake to build treesitter on all platforms (#21984)
This reduces platform-specific differences and the amount of code.
| -rw-r--r-- | cmake.deps/cmake/BuildTreesitter.cmake | 32 | ||||
| -rw-r--r-- | cmake.deps/cmake/TreesitterCMakeLists.txt | 3 | ||||
| -rwxr-xr-x | src/nvim/CMakeLists.txt | 2 |
3 files changed, 12 insertions, 25 deletions
diff --git a/cmake.deps/cmake/BuildTreesitter.cmake b/cmake.deps/cmake/BuildTreesitter.cmake index 836c25fe1d..ce33f22b5c 100644 --- a/cmake.deps/cmake/BuildTreesitter.cmake +++ b/cmake.deps/cmake/BuildTreesitter.cmake @@ -1,21 +1,3 @@ -if(MSVC) - set(TREESITTER_CONFIGURE_COMMAND ${CMAKE_COMMAND} -E copy - ${CMAKE_CURRENT_SOURCE_DIR}/cmake/TreesitterCMakeLists.txt - ${DEPS_BUILD_DIR}/src/tree-sitter/CMakeLists.txt - COMMAND ${CMAKE_COMMAND} ${DEPS_BUILD_DIR}/src/tree-sitter/CMakeLists.txt - -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} - -DCMAKE_GENERATOR=${CMAKE_GENERATOR} - -DCMAKE_GENERATOR_PLATFORM=${CMAKE_GENERATOR_PLATFORM} - ${BUILD_TYPE_STRING} - -DCMAKE_INSTALL_PREFIX=${DEPS_INSTALL_DIR}) - set(TREESITTER_BUILD_COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>) - set(TREESITTER_INSTALL_COMMAND ${CMAKE_COMMAND} --build . --target install --config $<CONFIG>) -else() - set(TREESITTER_BUILD_COMMAND ${MAKE_PRG} CC=${DEPS_C_COMPILER}) - set(TREESITTER_INSTALL_COMMAND - ${MAKE_PRG} CC=${DEPS_C_COMPILER} PREFIX=${DEPS_INSTALL_DIR} install) -endif() - if(USE_EXISTING_SRC_DIR) unset(TREESITTER_URL) endif() @@ -25,9 +7,15 @@ ExternalProject_Add(tree-sitter DOWNLOAD_NO_PROGRESS TRUE DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}/tree-sitter INSTALL_DIR ${DEPS_INSTALL_DIR} - BUILD_IN_SOURCE 1 - CONFIGURE_COMMAND "${TREESITTER_CONFIGURE_COMMAND}" - BUILD_COMMAND "${TREESITTER_BUILD_COMMAND}" - INSTALL_COMMAND "${TREESITTER_INSTALL_COMMAND}") + PATCH_COMMAND ${CMAKE_COMMAND} -E copy + ${CMAKE_CURRENT_SOURCE_DIR}/cmake/TreesitterCMakeLists.txt + ${DEPS_BUILD_DIR}/src/tree-sitter/CMakeLists.txt + CMAKE_ARGS + -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} + -DCMAKE_GENERATOR=${CMAKE_GENERATOR} + -DCMAKE_GENERATOR_PLATFORM=${CMAKE_GENERATOR_PLATFORM} + -DCMAKE_INSTALL_PREFIX=${DEPS_INSTALL_DIR} + -DCMAKE_POSITION_INDEPENDENT_CODE=ON + ${BUILD_TYPE_STRING}) list(APPEND THIRD_PARTY_DEPS tree-sitter) diff --git a/cmake.deps/cmake/TreesitterCMakeLists.txt b/cmake.deps/cmake/TreesitterCMakeLists.txt index 27a57f80af..49fb19c96a 100644 --- a/cmake.deps/cmake/TreesitterCMakeLists.txt +++ b/cmake.deps/cmake/TreesitterCMakeLists.txt @@ -2,7 +2,8 @@ cmake_minimum_required(VERSION 3.10) project(tree-sitter LANGUAGES C) add_library(tree-sitter lib/src/lib.c) -target_include_directories(tree-sitter PRIVATE lib/include) +target_include_directories(tree-sitter + PRIVATE lib/src lib/include) install(FILES lib/include/tree_sitter/api.h diff --git a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt index 0929aeeb2a..2361210e59 100755 --- a/src/nvim/CMakeLists.txt +++ b/src/nvim/CMakeLists.txt @@ -684,8 +684,6 @@ foreach(hfile ${NVIM_GENERATED_FOR_HEADERS}) endif() endforeach() -# Our dependencies come first. - if (CMAKE_SYSTEM_NAME MATCHES "OpenBSD") target_link_libraries(main_lib INTERFACE pthread c++abi) endif() |