1 files changed, 21 insertions, 46 deletions
diff --git a/cmake.deps/cmake/BuildTreesitter.cmake b/cmake.deps/cmake/BuildTreesitter.cmake
index 6d98f6179c..c3ea02014f 100644
--- a/cmake.deps/cmake/BuildTreesitter.cmake
+++ b/cmake.deps/cmake/BuildTreesitter.cmake
@@ -1,42 +1,5 @@
-# BuildTreeSitter(TARGET targetname CONFIGURE_COMMAND ... BUILD_COMMAND ... INSTALL_COMMAND ...)
-function(BuildTreeSitter)
-  cmake_parse_arguments(_treesitter
-    "BUILD_IN_SOURCE"
-    "TARGET"
-    "CONFIGURE_COMMAND;BUILD_COMMAND;INSTALL_COMMAND"
-    ${ARGN})
-
-  if(NOT _treesitter_CONFIGURE_COMMAND AND NOT _treesitter_BUILD_COMMAND
-      AND NOT _treesitter_INSTALL_COMMAND)
-    message(FATAL_ERROR "Must pass at least one of CONFIGURE_COMMAND,  BUILD_COMMAND, INSTALL_COMMAND")
-  endif()
-  if(NOT _treesitter_TARGET)
-    set(_treesitter_TARGET "tree-sitter")
-  endif()
-
-  ExternalProject_Add(tree-sitter
-    PREFIX ${DEPS_BUILD_DIR}
-    URL ${TREESITTER_URL}
-    DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}/tree-sitter
-    INSTALL_DIR ${DEPS_INSTALL_DIR}
-    DOWNLOAD_COMMAND ${CMAKE_COMMAND}
-    -DPREFIX=${DEPS_BUILD_DIR}
-    -DDOWNLOAD_DIR=${DEPS_DOWNLOAD_DIR}/tree-sitter
-    -DURL=${TREESITTER_URL}
-    -DEXPECTED_SHA256=${TREESITTER_SHA256}
-    -DTARGET=tree-sitter
-    -DUSE_EXISTING_SRC_DIR=${USE_EXISTING_SRC_DIR}
-    -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/DownloadAndExtractFile.cmake
-    BUILD_IN_SOURCE ${_treesitter_BUILD_IN_SOURCE}
-    PATCH_COMMAND ""
-    CONFIGURE_COMMAND "${_treesitter_CONFIGURE_COMMAND}"
-    BUILD_COMMAND "${_treesitter_BUILD_COMMAND}"
-    INSTALL_COMMAND "${_treesitter_INSTALL_COMMAND}")
-endfunction()
-
 if(MSVC)
-  BuildTreeSitter(BUILD_IN_SOURCE
-    CONFIGURE_COMMAND ${CMAKE_COMMAND} -E copy
+  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
@@ -44,16 +7,28 @@ if(MSVC)
       -DCMAKE_GENERATOR=${CMAKE_GENERATOR}
       -DCMAKE_GENERATOR_PLATFORM=${CMAKE_GENERATOR_PLATFORM}
       ${BUILD_TYPE_STRING}
-      -DCMAKE_INSTALL_PREFIX=${DEPS_INSTALL_DIR}
-    BUILD_COMMAND ${CMAKE_COMMAND} --build . --config ${CMAKE_BUILD_TYPE}
-    INSTALL_COMMAND ${CMAKE_COMMAND} --build . --target install --config ${CMAKE_BUILD_TYPE}
-    )
+      -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(TS_CFLAGS "-O3 -Wall -Wextra")
-  BuildTreeSitter(BUILD_IN_SOURCE
-    CONFIGURE_COMMAND ""
-    BUILD_COMMAND ${MAKE_PRG} CC=${DEPS_C_COMPILER} CFLAGS=${TS_CFLAGS}
-    INSTALL_COMMAND ${MAKE_PRG} CC=${DEPS_C_COMPILER} PREFIX=${DEPS_INSTALL_DIR} install)
+  set(TREESITTER_BUILD_COMMAND ${MAKE_PRG} CC=${DEPS_C_COMPILER} CFLAGS=${TS_CFLAGS})
+  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()
+ExternalProject_Add(tree-sitter
+  URL ${TREESITTER_URL}
+  URL_HASH SHA256=${TREESITTER_SHA256}
+  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}")
 
 list(APPEND THIRD_PARTY_DEPS tree-sitter)