From e83ce331da9165ad611b31aef9965fa74abaea14 Mon Sep 17 00:00:00 2001 From: dundargoc Date: Sun, 22 Sep 2024 16:59:26 +0200 Subject: build: use treesitter's CMakeLists.txt --- cmake.deps/cmake/BuildTreesitter.cmake | 16 +++------------- cmake.deps/cmake/TreesitterCMakeLists.txt | 17 ----------------- 2 files changed, 3 insertions(+), 30 deletions(-) delete mode 100644 cmake.deps/cmake/TreesitterCMakeLists.txt (limited to 'cmake.deps/cmake') diff --git a/cmake.deps/cmake/BuildTreesitter.cmake b/cmake.deps/cmake/BuildTreesitter.cmake index 55526b6f1d..f5962c8037 100644 --- a/cmake.deps/cmake/BuildTreesitter.cmake +++ b/cmake.deps/cmake/BuildTreesitter.cmake @@ -1,22 +1,12 @@ if(ENABLE_WASMTIME) - if(USE_BUNDLED_WASMTIME) - set(WASMTIME_CACHE_ARGS "-DCMAKE_C_FLAGS:STRING=-I${DEPS_INSTALL_DIR}/include/wasmtime -I${DEPS_INSTALL_DIR}/include") - else() - find_package(Wasmtime 24.0.0 EXACT REQUIRED) - set(WASMTIME_CACHE_ARGS "-DCMAKE_C_FLAGS:STRING=-I${WASMTIME_INCLUDE_DIR}") - endif() - string(APPEND WASMTIME_CACHE_ARGS " -DTREE_SITTER_FEATURE_WASM") - set(WASMTIME_ARGS -D CMAKE_C_STANDARD=11) + set(TREESITTER_ARGS -D TREE_SITTER_FEATURE_WASM=ON) endif() get_externalproject_options(treesitter ${DEPS_IGNORE_SHA}) ExternalProject_Add(treesitter DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}/treesitter - PATCH_COMMAND ${CMAKE_COMMAND} -E copy - ${CMAKE_CURRENT_SOURCE_DIR}/cmake/TreesitterCMakeLists.txt - ${DEPS_BUILD_DIR}/src/treesitter/CMakeLists.txt - CMAKE_ARGS ${DEPS_CMAKE_ARGS} ${WASMTIME_ARGS} - CMAKE_CACHE_ARGS ${WASMTIME_CACHE_ARGS} + SOURCE_SUBDIR lib + CMAKE_ARGS ${DEPS_CMAKE_ARGS} ${TREESITTER_ARGS} ${EXTERNALPROJECT_OPTIONS}) if(USE_BUNDLED_WASMTIME) diff --git a/cmake.deps/cmake/TreesitterCMakeLists.txt b/cmake.deps/cmake/TreesitterCMakeLists.txt deleted file mode 100644 index 3d3705c8ab..0000000000 --- a/cmake.deps/cmake/TreesitterCMakeLists.txt +++ /dev/null @@ -1,17 +0,0 @@ -cmake_minimum_required(VERSION 3.16) -project(treesitter C) - -add_compile_options(-w) - -add_library(tree-sitter lib/src/lib.c) -target_include_directories(tree-sitter - PRIVATE lib/src lib/src/wasm lib/include) - -install(FILES - lib/include/tree_sitter/api.h - DESTINATION include/tree_sitter) - -include(GNUInstallDirs) -install(TARGETS tree-sitter DESTINATION ${CMAKE_INSTALL_LIBDIR}) - -# vim: set ft=cmake: -- cgit