neovim

commit bcbdb94185168048fe7140d9fe3d8eafeff7d9da
parent 20a932cb72cf077d54e3498ef93341ffe3d4cdbb
Author: dundargoc <33953936+dundargoc@users.noreply.github.com>
Date:   Tue, 24 Jan 2023 08:55:56 +0100

build: simplify treesitter installation (#21969)


Diffstat:
M
cmake.deps/cmake/BuildTreesitter.cmake
 | 
3
+--
M
cmake.deps/cmake/TreesitterCMakeLists.txt
 | 
14
+++-----------

2 files changed, 4 insertions(+), 13 deletions(-)
diff --git a/cmake.deps/cmake/BuildTreesitter.cmake b/cmake.deps/cmake/BuildTreesitter.cmake
@@ -11,8 +11,7 @@ if(MSVC)
   set(TREESITTER_BUILD_COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>)
   set(TREESITTER_INSTALL_COMMAND ${CMAKE_COMMAND} --build . --target install --config $<CONFIG>)
 else()
-  set(TS_CFLAGS "-O3 -Wall -Wextra")
-  set(TREESITTER_BUILD_COMMAND ${MAKE_PRG} CC=${DEPS_C_COMPILER} CFLAGS=${TS_CFLAGS})
+  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()
diff --git a/cmake.deps/cmake/TreesitterCMakeLists.txt b/cmake.deps/cmake/TreesitterCMakeLists.txt
@@ -1,15 +1,8 @@
 cmake_minimum_required(VERSION 3.10)
 project(tree-sitter LANGUAGES C)
 
-file(GLOB SRC_FILES ${PROJECT_SOURCE_DIR}/lib/src/*.c)
-foreach(sfile ${SRC_FILES})
-  get_filename_component(f ${sfile} NAME)
-  if(${f} MATCHES "lib.c$")
-    list(REMOVE_ITEM SRC_FILES ${sfile})
-  endif()
-endforeach()
-include_directories(${PROJECT_SOURCE_DIR}/lib/include)
-add_library(tree-sitter ${SRC_FILES})
+add_library(tree-sitter lib/src/lib.c)
+target_include_directories(tree-sitter PRIVATE lib/include)
 
 install(FILES
   lib/include/tree_sitter/api.h
@@ -17,7 +10,6 @@ install(FILES
   DESTINATION include/tree_sitter)
 
 include(GNUInstallDirs)
-install(TARGETS tree-sitter
-  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+install(TARGETS tree-sitter DESTINATION ${CMAKE_INSTALL_LIBDIR})
 
 # vim: set ft=cmake: