17 files changed, 55 insertions, 455 deletions
diff --git a/cmake.deps/cmake/BuildGettext.cmake b/cmake.deps/cmake/BuildGettext.cmake
index 4ba1f46d2e..1f9fd38702 100644
--- a/cmake.deps/cmake/BuildGettext.cmake
+++ b/cmake.deps/cmake/BuildGettext.cmake
@@ -10,13 +10,10 @@ if(MSVC)
     PATCH_COMMAND ${CMAKE_COMMAND} -E copy
       ${CMAKE_CURRENT_SOURCE_DIR}/cmake/GettextCMakeLists.txt
       ${DEPS_BUILD_DIR}/src/gettext/CMakeLists.txt
-    CMAKE_ARGS
-      -DCMAKE_INSTALL_PREFIX=${DEPS_INSTALL_DIR}
-      ${BUILD_TYPE_STRING}
-      -DCMAKE_GENERATOR=${CMAKE_GENERATOR}
-      -DCMAKE_GENERATOR_PLATFORM=${CMAKE_GENERATOR_PLATFORM}
+    CMAKE_ARGS ${DEPS_CMAKE_ARGS}
       -DLIBICONV_INCLUDE_DIRS=${DEPS_INSTALL_DIR}/include
-      -DLIBICONV_LIBRARIES=${DEPS_LIB_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}libcharset${CMAKE_STATIC_LIBRARY_SUFFIX}$<SEMICOLON>${DEPS_LIB_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}libiconv${CMAKE_STATIC_LIBRARY_SUFFIX})
+      -DLIBICONV_LIBRARIES=${DEPS_LIB_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}libcharset${CMAKE_STATIC_LIBRARY_SUFFIX}$<SEMICOLON>${DEPS_LIB_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}libiconv${CMAKE_STATIC_LIBRARY_SUFFIX}
+    CMAKE_CACHE_ARGS ${DEPS_CMAKE_CACHE_ARGS})
 else()
   message(FATAL_ERROR "Trying to build gettext in an unsupported system ${CMAKE_SYSTEM_NAME}/${CMAKE_C_COMPILER_ID}")
 endif()
diff --git a/cmake.deps/cmake/BuildLibiconv.cmake b/cmake.deps/cmake/BuildLibiconv.cmake
index 382aae3df7..4b9c07ed6c 100644
--- a/cmake.deps/cmake/BuildLibiconv.cmake
+++ b/cmake.deps/cmake/BuildLibiconv.cmake
@@ -10,11 +10,8 @@ if(MSVC)
     PATCH_COMMAND ${CMAKE_COMMAND} -E copy
       ${CMAKE_CURRENT_SOURCE_DIR}/cmake/LibiconvCMakeLists.txt
       ${DEPS_BUILD_DIR}/src/libiconv/CMakeLists.txt
-    CMAKE_ARGS
-      -DCMAKE_INSTALL_PREFIX=${DEPS_INSTALL_DIR}
-      ${BUILD_TYPE_STRING}
-      -DCMAKE_GENERATOR=${CMAKE_GENERATOR}
-      -DCMAKE_GENERATOR_PLATFORM=${CMAKE_GENERATOR_PLATFORM})
+    CMAKE_ARGS ${DEPS_CMAKE_ARGS}
+    CMAKE_CACHE_ARGS ${DEPS_CMAKE_CACHE_ARGS})
 else()
   message(FATAL_ERROR "Trying to build libiconv in an unsupported system ${CMAKE_SYSTEM_NAME}/${CMAKE_C_COMPILER_ID}")
 endif()
diff --git a/cmake.deps/cmake/BuildLibtermkey.cmake b/cmake.deps/cmake/BuildLibtermkey.cmake
index 1e0fb5d36a..6457a864ba 100644
--- a/cmake.deps/cmake/BuildLibtermkey.cmake
+++ b/cmake.deps/cmake/BuildLibtermkey.cmake
@@ -1,27 +1,3 @@
-if(WIN32)
-  set(LIBTERMKEY_CONFIGURE_COMMAND ${CMAKE_COMMAND} -E copy
-      ${CMAKE_CURRENT_SOURCE_DIR}/cmake/libtermkeyCMakeLists.txt
-      ${DEPS_BUILD_DIR}/src/libtermkey/CMakeLists.txt
-    COMMAND ${CMAKE_COMMAND} ${DEPS_BUILD_DIR}/src/libtermkey
-      -DCMAKE_INSTALL_PREFIX=${DEPS_INSTALL_DIR}
-      ${BUILD_TYPE_STRING}
-      # Hack to avoid -rdynamic in Mingw
-      -DCMAKE_SHARED_LIBRARY_LINK_C_FLAGS=""
-      -DCMAKE_GENERATOR=${CMAKE_GENERATOR}
-      -DCMAKE_GENERATOR_PLATFORM=${CMAKE_GENERATOR_PLATFORM}
-      -DUNIBILIUM_INCLUDE_DIRS=${DEPS_INSTALL_DIR}/include
-      -DUNIBILIUM_LIBRARIES=${DEPS_LIB_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}unibilium${CMAKE_STATIC_LIBRARY_SUFFIX})
-  set(LIBTERMKEY_BUILD_COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>)
-  set(LIBTERMKEY_INSTALL_COMMAND ${CMAKE_COMMAND} --build . --target install --config $<CONFIG>)
-else()
-  find_package(PkgConfig REQUIRED)
-
-  set(LIBTERMKEY_BUILD_COMMAND "" BUILD_IN_SOURCE 1)
-  set(LIBTERMKEY_INSTALL_COMMAND ${MAKE_PRG} CC=${DEPS_C_COMPILER}
-    PREFIX=${DEPS_INSTALL_DIR} PKG_CONFIG_PATH=${DEPS_LIB_DIR}/pkgconfig
-    CFLAGS=-fPIC LDFLAGS+=-static ${DEFAULT_MAKE_CFLAGS} install)
-endif()
-
 if(USE_EXISTING_SRC_DIR)
   unset(LIBTERMKEY_URL)
 endif()
@@ -30,8 +6,13 @@ ExternalProject_Add(libtermkey
   URL_HASH SHA256=${LIBTERMKEY_SHA256}
   DOWNLOAD_NO_PROGRESS TRUE
   DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}/libtermkey
-  CONFIGURE_COMMAND "${LIBTERMKEY_CONFIGURE_COMMAND}"
-  BUILD_COMMAND "${LIBTERMKEY_BUILD_COMMAND}"
-  INSTALL_COMMAND "${LIBTERMKEY_INSTALL_COMMAND}")
+  PATCH_COMMAND ${CMAKE_COMMAND} -E copy
+    ${CMAKE_CURRENT_SOURCE_DIR}/cmake/libtermkeyCMakeLists.txt
+    ${DEPS_BUILD_DIR}/src/libtermkey/CMakeLists.txt
+  CMAKE_ARGS ${DEPS_CMAKE_ARGS}
+    -DCMAKE_SHARED_LIBRARY_LINK_C_FLAGS="" # Hack to avoid -rdynamic in Mingw
+    -DUNIBILIUM_INCLUDE_DIRS=${DEPS_INSTALL_DIR}/include
+    -DUNIBILIUM_LIBRARIES=${DEPS_LIB_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}unibilium${CMAKE_STATIC_LIBRARY_SUFFIX}
+  CMAKE_CACHE_ARGS ${DEPS_CMAKE_CACHE_ARGS})
 
 list(APPEND THIRD_PARTY_DEPS libtermkey)
diff --git a/cmake.deps/cmake/BuildLibuv.cmake b/cmake.deps/cmake/BuildLibuv.cmake
index c21e166d95..eb88458644 100644
--- a/cmake.deps/cmake/BuildLibuv.cmake
+++ b/cmake.deps/cmake/BuildLibuv.cmake
@@ -5,15 +5,11 @@ ExternalProject_Add(libuv
   URL ${LIBUV_URL}
   URL_HASH SHA256=${LIBUV_SHA256}
   DOWNLOAD_NO_PROGRESS TRUE
-  CMAKE_ARGS
-    -DCMAKE_INSTALL_PREFIX=${DEPS_INSTALL_DIR}
+  DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}/libuv
+  CMAKE_ARGS ${DEPS_CMAKE_ARGS}
     -DCMAKE_INSTALL_LIBDIR=lib
     -DBUILD_TESTING=OFF
-    -DCMAKE_POSITION_INDEPENDENT_CODE=ON
     -DLIBUV_BUILD_SHARED=OFF
-    ${BUILD_TYPE_STRING}
-  CMAKE_CACHE_ARGS
-    -DCMAKE_OSX_ARCHITECTURES:STRING=${CMAKE_OSX_ARCHITECTURES}
-  DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}/libuv)
+  CMAKE_CACHE_ARGS ${DEPS_CMAKE_CACHE_ARGS})
 
 list(APPEND THIRD_PARTY_DEPS libuv)
diff --git a/cmake.deps/cmake/BuildLibvterm.cmake b/cmake.deps/cmake/BuildLibvterm.cmake
index dffa545638..b75987eb24 100644
--- a/cmake.deps/cmake/BuildLibvterm.cmake
+++ b/cmake.deps/cmake/BuildLibvterm.cmake
@@ -1,29 +1,3 @@
-if(WIN32)
-  set(LIBVTERM_CONFIGURE_COMMAND ${CMAKE_COMMAND} -E copy
-      ${CMAKE_CURRENT_SOURCE_DIR}/cmake/LibvtermCMakeLists.txt
-      ${DEPS_BUILD_DIR}/src/libvterm/CMakeLists.txt
-    COMMAND ${CMAKE_COMMAND} -E copy
-      ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Libvterm-tbl2inc_c.cmake
-      ${DEPS_BUILD_DIR}/src/libvterm/tbl2inc_c.cmake
-    COMMAND ${CMAKE_COMMAND} ${DEPS_BUILD_DIR}/src/libvterm
-      -DCMAKE_INSTALL_PREFIX=${DEPS_INSTALL_DIR}
-      -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
-      -DCMAKE_GENERATOR_PLATFORM=${CMAKE_GENERATOR_PLATFORM}
-      -DCMAKE_GENERATOR=${CMAKE_GENERATOR})
-  if(NOT MSVC)
-    list(APPEND LIBVTERM_CONFIGURE_COMMAND "-DCMAKE_C_FLAGS:STRING=-fPIC")
-  endif()
-  set(LIBVTERM_BUILD_COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>)
-  set(LIBVTERM_INSTALL_COMMAND ${CMAKE_COMMAND} --build . --target install --config $<CONFIG>)
-else()
-  set(LIBVTERM_INSTALL_COMMAND ${MAKE_PRG} CC=${DEPS_C_COMPILER}
-                                           PREFIX=${DEPS_INSTALL_DIR}
-                                           CFLAGS=-fPIC
-                                           LDFLAGS+=-static
-                                           ${DEFAULT_MAKE_CFLAGS}
-                                           install)
-endif()
-
 if(USE_EXISTING_SRC_DIR)
   unset(LIBVTERM_URL)
 endif()
@@ -32,9 +6,10 @@ ExternalProject_Add(libvterm
   URL_HASH SHA256=${LIBVTERM_SHA256}
   DOWNLOAD_NO_PROGRESS TRUE
   DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}/libvterm
-  BUILD_IN_SOURCE 1
-  CONFIGURE_COMMAND "${LIBVTERM_CONFIGURE_COMMAND}"
-  BUILD_COMMAND "${LIBVTERM_BUILD_COMMAND}"
-  INSTALL_COMMAND "${LIBVTERM_INSTALL_COMMAND}")
+  PATCH_COMMAND ${CMAKE_COMMAND} -E copy
+    ${CMAKE_CURRENT_SOURCE_DIR}/cmake/LibvtermCMakeLists.txt
+    ${DEPS_BUILD_DIR}/src/libvterm/CMakeLists.txt
+  CMAKE_ARGS ${DEPS_CMAKE_ARGS}
+  CMAKE_CACHE_ARGS ${DEPS_CMAKE_CACHE_ARGS})
 
 list(APPEND THIRD_PARTY_DEPS libvterm)
diff --git a/cmake.deps/cmake/BuildLuarocks.cmake b/cmake.deps/cmake/BuildLuarocks.cmake
index d0b4a8e7d1..b84ce34d45 100644
--- a/cmake.deps/cmake/BuildLuarocks.cmake
+++ b/cmake.deps/cmake/BuildLuarocks.cmake
@@ -148,7 +148,7 @@ if(USE_BUNDLED_BUSTED)
     set(LUACHECK_EXE "${DEPS_BIN_DIR}/luacheck")
   endif()
   add_custom_command(OUTPUT ${BUSTED_EXE}
-    COMMAND ${LUAROCKS_BINARY} build busted 2.0.0 ${LUAROCKS_BUILDARGS}
+    COMMAND ${LUAROCKS_BINARY} build busted 2.1.1 ${LUAROCKS_BUILDARGS}
     DEPENDS penlight)
   add_custom_target(busted DEPENDS ${BUSTED_EXE})
 
diff --git a/cmake.deps/cmake/BuildLuv.cmake b/cmake.deps/cmake/BuildLuv.cmake
index 1a599a9ee2..38c0503c5b 100644
--- a/cmake.deps/cmake/BuildLuv.cmake
+++ b/cmake.deps/cmake/BuildLuv.cmake
@@ -1,13 +1,7 @@
-set(LUV_SRC_DIR ${DEPS_BUILD_DIR}/src/luv)
 set(LUV_INCLUDE_FLAGS
   "-I${DEPS_INSTALL_DIR}/include -I${DEPS_INSTALL_DIR}/include/luajit-2.1")
 
-set(LUV_CONFIGURE_COMMAND_COMMON
-  ${CMAKE_COMMAND} ${LUV_SRC_DIR}
-  -DCMAKE_GENERATOR=${CMAKE_GENERATOR}
-  ${BUILD_TYPE_STRING}
-  -DCMAKE_INSTALL_PREFIX=${DEPS_INSTALL_DIR}
-  -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES_ALT_SEP}
+set(LUV_CMAKE_ARGS
   -DLUA_BUILD_TYPE=System
   -DLUA_COMPAT53_DIR=${DEPS_BUILD_DIR}/src/lua-compat-5.3
   -DWITH_SHARED_LIBUV=ON
@@ -16,43 +10,29 @@ set(LUV_CONFIGURE_COMMAND_COMMON
   -DBUILD_MODULE=OFF)
 
 if(USE_BUNDLED_LUAJIT)
-  list(APPEND LUV_CONFIGURE_COMMAND_COMMON -DWITH_LUA_ENGINE=LuaJit)
+  list(APPEND LUV_CMAKE_ARGS -DWITH_LUA_ENGINE=LuaJit)
 elseif(USE_BUNDLED_LUA)
-  list(APPEND LUV_CONFIGURE_COMMAND_COMMON -DWITH_LUA_ENGINE=Lua)
+  list(APPEND LUV_CMAKE_ARGS -DWITH_LUA_ENGINE=Lua)
 else()
   find_package(LuaJit)
   if(LUAJIT_FOUND)
-    list(APPEND LUV_CONFIGURE_COMMAND_COMMON -DWITH_LUA_ENGINE=LuaJit)
+    list(APPEND LUV_CMAKE_ARGS -DWITH_LUA_ENGINE=LuaJit)
   else()
-    list(APPEND LUV_CONFIGURE_COMMAND_COMMON -DWITH_LUA_ENGINE=Lua)
+    list(APPEND LUV_CMAKE_ARGS -DWITH_LUA_ENGINE=Lua)
   endif()
 endif()
 
 if(USE_BUNDLED_LIBUV)
-  set(LUV_CONFIGURE_COMMAND_COMMON
-    ${LUV_CONFIGURE_COMMAND_COMMON}
+  list(APPEND LUV_CMAKE_ARGS
     -DCMAKE_PREFIX_PATH=${DEPS_INSTALL_DIR}
     -DLIBUV_LIBRARIES=uv_a)
 endif()
 
-if(MSVC)
-  set(LUV_CONFIGURE_COMMAND
-    ${LUV_CONFIGURE_COMMAND_COMMON}
-    -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
-    -DCMAKE_GENERATOR_PLATFORM=${CMAKE_GENERATOR_PLATFORM}
-    "-DCMAKE_C_FLAGS:STRING=${LUV_INCLUDE_FLAGS}"
-    # Make sure we use the same generator, otherwise we may
-    # accidentally end up using different MSVC runtimes
-    -DCMAKE_GENERATOR=${CMAKE_GENERATOR})
-else()
-  set(LUV_CONFIGURE_COMMAND
-    ${LUV_CONFIGURE_COMMAND_COMMON}
-    -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
-    "-DCMAKE_C_FLAGS:STRING=${LUV_INCLUDE_FLAGS} -fPIC")
-  if(CMAKE_GENERATOR MATCHES "Unix Makefiles" AND
-      (CMAKE_SYSTEM_NAME MATCHES ".*BSD" OR CMAKE_SYSTEM_NAME MATCHES "DragonFly"))
-      set(LUV_CONFIGURE_COMMAND ${LUV_CONFIGURE_COMMAND} -DCMAKE_MAKE_PROGRAM=gmake)
-  endif()
+list(APPEND LUV_CMAKE_ARGS
+  "-DCMAKE_C_FLAGS:STRING=${LUV_INCLUDE_FLAGS}")
+if(CMAKE_GENERATOR MATCHES "Unix Makefiles" AND
+    (CMAKE_SYSTEM_NAME MATCHES ".*BSD" OR CMAKE_SYSTEM_NAME MATCHES "DragonFly"))
+    list(APPEND LUV_CMAKE_ARGS -DCMAKE_MAKE_PROGRAM=gmake)
 endif()
 
 if(USE_EXISTING_SRC_DIR)
@@ -77,10 +57,8 @@ ExternalProject_Add(luv-static
   DOWNLOAD_NO_PROGRESS TRUE
   DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}/luv
   SOURCE_DIR ${DEPS_BUILD_DIR}/src/luv
-  CONFIGURE_COMMAND "${LUV_CONFIGURE_COMMAND}"
-  BUILD_COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>
-  INSTALL_COMMAND ${CMAKE_COMMAND} --build . --target install --config $<CONFIG>
-  LIST_SEPARATOR |)
+  CMAKE_ARGS ${DEPS_CMAKE_ARGS} ${LUV_CMAKE_ARGS}
+  CMAKE_CACHE_ARGS ${DEPS_CMAKE_CACHE_ARGS})
 
 list(APPEND THIRD_PARTY_DEPS luv-static)
 if(USE_BUNDLED_LUAJIT)
diff --git a/cmake.deps/cmake/BuildMsgpack.cmake b/cmake.deps/cmake/BuildMsgpack.cmake
index 3197ec45a1..431420fb62 100644
--- a/cmake.deps/cmake/BuildMsgpack.cmake
+++ b/cmake.deps/cmake/BuildMsgpack.cmake
@@ -1,25 +1,3 @@
-set(MSGPACK_CMAKE_ARGS
-  -DMSGPACK_BUILD_TESTS=OFF
-  -DMSGPACK_BUILD_EXAMPLES=OFF
-  -DCMAKE_INSTALL_PREFIX=${DEPS_INSTALL_DIR}
-  -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
-  -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES_ALT_SEP}
-  "-DCMAKE_C_FLAGS:STRING=-fPIC"
-  -DCMAKE_GENERATOR=${CMAKE_GENERATOR})
-
-if(MSVC)
-  set(MSGPACK_CMAKE_ARGS
-    -DMSGPACK_BUILD_TESTS=OFF
-    -DMSGPACK_BUILD_EXAMPLES=OFF
-    -DCMAKE_INSTALL_PREFIX=${DEPS_INSTALL_DIR}
-    -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
-    -DCMAKE_GENERATOR_PLATFORM=${CMAKE_GENERATOR_PLATFORM}
-    ${BUILD_TYPE_STRING}
-    # Make sure we use the same generator, otherwise we may
-    # accidentally end up using different MSVC runtimes
-    -DCMAKE_GENERATOR=${CMAKE_GENERATOR})
-endif()
-
 if(USE_EXISTING_SRC_DIR)
   unset(MSGPACK_URL)
 endif()
@@ -28,7 +6,9 @@ ExternalProject_Add(msgpack
   URL_HASH SHA256=${MSGPACK_SHA256}
   DOWNLOAD_NO_PROGRESS TRUE
   DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}/msgpack
-  CMAKE_ARGS "${MSGPACK_CMAKE_ARGS}"
-  LIST_SEPARATOR |)
+  CMAKE_ARGS ${DEPS_CMAKE_ARGS}
+    -DMSGPACK_BUILD_TESTS=OFF
+    -DMSGPACK_BUILD_EXAMPLES=OFF
+  CMAKE_CACHE_ARGS ${DEPS_CMAKE_CACHE_ARGS})
 
 list(APPEND THIRD_PARTY_DEPS msgpack)
diff --git a/cmake.deps/cmake/BuildTreesitter.cmake b/cmake.deps/cmake/BuildTreesitter.cmake
index c3ea02014f..d906e6aa59 100644
--- a/cmake.deps/cmake/BuildTreesitter.cmake
+++ b/cmake.deps/cmake/BuildTreesitter.cmake
@@ -1,22 +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(TS_CFLAGS "-O3 -Wall -Wextra")
-  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()
@@ -26,9 +7,10 @@ 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 ${DEPS_CMAKE_ARGS}
+  CMAKE_CACHE_ARGS ${DEPS_CMAKE_CACHE_ARGS})
 
 list(APPEND THIRD_PARTY_DEPS tree-sitter)
diff --git a/cmake.deps/cmake/BuildTreesitterParsers.cmake b/cmake.deps/cmake/BuildTreesitterParsers.cmake
index ead039aae6..d62b19d97d 100644
--- a/cmake.deps/cmake/BuildTreesitterParsers.cmake
+++ b/cmake.deps/cmake/BuildTreesitterParsers.cmake
@@ -8,14 +8,12 @@ function(BuildTSParser LANG TS_URL TS_SHA256 TS_CMAKE_FILE)
     URL_HASH SHA256=${TS_SHA256}
     DOWNLOAD_NO_PROGRESS TRUE
     DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}/${NAME}
-    CMAKE_CACHE_ARGS
-      -DCMAKE_OSX_ARCHITECTURES:STRING=${CMAKE_OSX_ARCHITECTURES}
     PATCH_COMMAND ${CMAKE_COMMAND} -E copy
       ${CMAKE_CURRENT_SOURCE_DIR}/cmake/${TS_CMAKE_FILE}
       ${DEPS_BUILD_DIR}/src/${NAME}/CMakeLists.txt
-    CMAKE_ARGS
-      -DCMAKE_INSTALL_PREFIX=${DEPS_INSTALL_DIR}
-      -DPARSERLANG=${LANG})
+    CMAKE_ARGS ${DEPS_CMAKE_ARGS}
+      -DPARSERLANG=${LANG}
+    CMAKE_CACHE_ARGS ${DEPS_CMAKE_CACHE_ARGS})
 endfunction()
 
 BuildTSParser(c ${TREESITTER_C_URL} ${TREESITTER_C_SHA256} TreesitterParserCMakeLists.txt)
diff --git a/cmake.deps/cmake/BuildUnibilium.cmake b/cmake.deps/cmake/BuildUnibilium.cmake
index cc56499edb..9a8caf89d1 100644
--- a/cmake.deps/cmake/BuildUnibilium.cmake
+++ b/cmake.deps/cmake/BuildUnibilium.cmake
@@ -1,21 +1,3 @@
-if(WIN32)
-  set(UNIBILIUM_CONFIGURE_COMMAND ${CMAKE_COMMAND} -E copy
-      ${CMAKE_CURRENT_SOURCE_DIR}/cmake/UnibiliumCMakeLists.txt
-      ${DEPS_BUILD_DIR}/src/unibilium/CMakeLists.txt
-    COMMAND ${CMAKE_COMMAND} ${DEPS_BUILD_DIR}/src/unibilium
-      -DCMAKE_INSTALL_PREFIX=${DEPS_INSTALL_DIR}
-      -DCMAKE_GENERATOR_PLATFORM=${CMAKE_GENERATOR_PLATFORM}
-      ${BUILD_TYPE_STRING}
-      -DCMAKE_GENERATOR=${CMAKE_GENERATOR})
-  set(UNIBILIUM_BUILD_COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>)
-  set(UNIBILIUM_INSTALL_COMMAND ${CMAKE_COMMAND} --build . --target install --config $<CONFIG>)
-else()
-  set(UNIBILIUM_BUILD_COMMAND ${MAKE_PRG} CC=${DEPS_C_COMPILER}
-      PREFIX=${DEPS_INSTALL_DIR} CFLAGS=-fPIC LDFLAGS+=-static
-    BUILD_IN_SOURCE 1)
-  set(UNIBILIUM_INSTALL_COMMAND ${MAKE_PRG} PREFIX=${DEPS_INSTALL_DIR} install)
-endif()
-
 if(USE_EXISTING_SRC_DIR)
   unset(UNIBILIUM_URL)
 endif()
@@ -24,8 +6,7 @@ ExternalProject_Add(unibilium
   URL_HASH SHA256=${UNIBILIUM_SHA256}
   DOWNLOAD_NO_PROGRESS TRUE
   DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}/unibilium
-  CONFIGURE_COMMAND "${UNIBILIUM_CONFIGURE_COMMAND}"
-  BUILD_COMMAND "${UNIBILIUM_BUILD_COMMAND}"
-  INSTALL_COMMAND "${UNIBILIUM_INSTALL_COMMAND}")
+  CMAKE_ARGS ${DEPS_CMAKE_ARGS}
+  CMAKE_CACHE_ARGS ${DEPS_CMAKE_CACHE_ARGS})
 
 list(APPEND THIRD_PARTY_DEPS unibilium)
diff --git a/cmake.deps/cmake/Libvterm-tbl2inc_c.cmake b/cmake.deps/cmake/Libvterm-tbl2inc_c.cmake
deleted file mode 100644
index 32d973680f..0000000000
--- a/cmake.deps/cmake/Libvterm-tbl2inc_c.cmake
+++ /dev/null
@@ -1,163 +0,0 @@
-cmake_minimum_required(VERSION 3.10)
-
-set(HEX_ALPHABET "0123456789abcdef")
-
-function(ConvertToHex dec hex)
-  while(dec GREATER 0)
-    math(EXPR _val "${dec} % 16")
-    math(EXPR dec "${dec} / 16")
-    string(SUBSTRING ${HEX_ALPHABET} ${_val} 1 _val)
-    set(_res "${_val}${_res}")
-  endwhile()
-  # Pad the result with the number of zeros
-  # specified by the optional third argument
-  if(${ARGC} EQUAL 3)
-    set(padding ${ARGV2})
-    string(LENGTH ${_res} _resLen)
-    if(_resLen LESS ${padding})
-      math(EXPR _neededPadding "${padding} - ${_resLen}")
-      foreach(i RANGE 1 ${_neededPadding})
-        set(_res "0${_res}")
-      endforeach()
-    endif()
-  endif()
-  set(${hex} "0x${_res}" PARENT_SCOPE)
-endfunction()
-
-function(ConvertFromHex hex dec)
-  string(TOLOWER ${hex} hex)
-  string(LENGTH "${hex}" _strlen)
-  set(_res 0)
-  while(_strlen GREATER 0)
-    math(EXPR _res "${_res} * 16")
-    string(SUBSTRING "${hex}" 0 1 NIBBLE)
-    string(SUBSTRING "${hex}" 1 -1 hex)
-    string(FIND ${HEX_ALPHABET} ${NIBBLE} value)
-    if(value EQUAL -1)
-      message(FATAL_ERROR "Invalid hex character '${NIBBLE}'")
-    endif()
-    math(EXPR _res "${_res} + ${value}")
-    string(LENGTH "${hex}" _strlen)
-  endwhile()
-  set(${dec} ${_res} PARENT_SCOPE)
-endfunction()
-
-# Based on http://www.json.org/JSON_checker/utf8_decode.c
-function(DecodeUtf8 hexBytes codePoint)
-  string(SUBSTRING ${hexBytes} 0 2 hexByte1)
-  ConvertFromHex(${hexByte1} byte1)
-  # Zero continuations (0 to 127)
-  math(EXPR out "${byte1} & 128")
-  if(out EQUAL 0)
-    set(${codePoint} ${byte1} PARENT_SCOPE)
-    return()
-  endif()
-  # One continuation (128 to 2047)
-  math(EXPR out "${byte1} & 224")
-  if(out EQUAL 192)
-    string(SUBSTRING ${hexBytes} 2 2 hexByte2)
-    ConvertFromHex(${hexByte2} byte2)
-    math(EXPR result "((${byte1} & 31) << 6) | ${byte2}")
-    if(result GREATER 127)
-      set(${codePoint} ${result} PARENT_SCOPE)
-      return()
-    endif()
-  else()
-    # Two continuations (2048 to 55295 and 57344 to 65535)
-    math(EXPR result "${byte1} & 240")
-    if(result EQUAL 224)
-      string(SUBSTRING ${hexBytes} 2 2 hexByte2)
-      string(SUBSTRING ${hexBytes} 4 2 hexByte3)
-      ConvertFromHex(${hexByte2} byte2)
-      ConvertFromHex(${hexByte3} byte3)
-      math(EXPR result "${byte2} | ${byte3}")
-      if(result GREATER -1)
-        math(EXPR result "((${byte1} & 15) << 12) | (${byte2} << 6) | ${byte3}")
-        if((result GREATER 2047) AND (result LESS 55296 OR result GREATER 57343))
-          set(${codePoint} ${result} PARENT_SCOPE)
-          return()
-        endif()
-      endif()
-    else()
-      # Three continuations (65536 to 1114111)
-      math(EXPR result "${byte1} & 248")
-      if(result EQUAL 224)
-        string(SUBSTRING ${hexBytes} 2 2 hexByte2)
-        string(SUBSTRING ${hexBytes} 4 2 hexByte3)
-        string(SUBSTRING ${hexBytes} 6 2 hexByte4)
-        ConvertFromHex(${hexByte2} byte2)
-        ConvertFromHex(${hexByte3} byte3)
-        ConvertFromHex(${hexByte4} byte4)
-        math(EXPR result "${byte2} | ${byte3} | ${byte4}")
-        if(result GREATER -1)
-          math(EXPR result "((c & 7) << 18) | (c1 << 12) | (c2 << 6) | c3")
-          if((result GREATER 65535) AND (result LESS 1114112))
-            set(${codePoint} ${result} PARENT_SCOPE)
-            return()
-          endif()
-        endif()
-      endif()
-    endif()
-  endif()
-  message(FATAL_ERROR "Invalid UTF-8 encoding")
-endfunction()
-
-set(inputFile ${CMAKE_ARGV3})
-set(outputFile ${CMAKE_ARGV4})
-# Get the file contents in text and hex-encoded format because
-# CMake doesn't provide functions for converting between the two
-file(READ "${inputFile}" contents)
-file(READ "${inputFile}" hexContents HEX)
-
-# Convert the text contents into a list of lines by escaping
-# the list separator ';' and then replacing new line characters
-# with the list separator
-string(REGEX REPLACE ";" "\\\\;" contents ${contents})
-string(REGEX REPLACE "\n" ";" contents ${contents})
-
-get_filename_component(encname ${inputFile} NAME_WE)
-set(output
-  "static const struct StaticTableEncoding encoding_${encname} = {\n"
-  "  { .decode = &decode_table },\n"
-  "  {")
-set(hexIndex 0)
-foreach(line ${contents})
-  string(LENGTH ${line} lineLength)
-  # Convert "A" to 0x41
-  string(FIND ${line} "\"" beginQuote)
-  if(NOT ${beginQuote} EQUAL -1)
-    string(FIND ${line} "\"" endQuote REVERSE)
-    if(${beginQuote} EQUAL ${endQuote})
-      message(FATAL_ERROR "Line contains only one quote")
-    endif()
-    math(EXPR beginHexQuote "${hexIndex} + (${beginQuote} + 1)*2")
-    math(EXPR endHexQuote "${hexIndex} + (${endQuote} + 1)*2")
-    math(EXPR quoteLen "${endHexQuote} - ${beginHexQuote} - 1")
-    string(SUBSTRING ${hexContents} ${beginHexQuote} ${quoteLen} hexQuote)
-    DecodeUtf8(${hexQuote} codePoint)
-    ConvertToHex(${codePoint} hexCodePoint 4)
-    STRING(REGEX REPLACE "\"(.+)\"" ${hexCodePoint} line ${line})
-  endif()
-  # Strip comment
-  string(REGEX REPLACE "[ \t\n]*#.*" "" line ${line})
-  # Convert 3/1 to [0x31]
-  string(REGEX REPLACE "^([0-9]+)/([0-9]+).*" "\\1;\\2" numbers ${line})
-  list(GET numbers 0 upperBits)
-  list(GET numbers 1 lowerBits)
-  math(EXPR res "${upperBits}*16 + ${lowerBits}")
-  ConvertToHex(${res} hex 2)
-  string(REGEX REPLACE "^([0-9]+)/([0-9]+)" "[${hex}]" line ${line})
-  # Convert U+0041 to 0x0041
-  string(REPLACE "U+" "0x" line ${line})
-  # Indent and append a comma
-  set(line "    ${line},")
-  set(output "${output}\n${line}")
-  # Increment the index by the number of characters in the line,
-  # plus one for the new line character then multiple by two for the hex digit index
-  math(EXPR hexIndex "${hexIndex} + 2*(${lineLength} + 1)")
-endforeach()
-set(output "${output}\n"
-  "  }\n"
-  "}\;\n")
-
-file(WRITE ${outputFile} ${output})
diff --git a/cmake.deps/cmake/LibvtermCMakeLists.txt b/cmake.deps/cmake/LibvtermCMakeLists.txt
index 079ad28ba0..777ce6c54c 100644
--- a/cmake.deps/cmake/LibvtermCMakeLists.txt
+++ b/cmake.deps/cmake/LibvtermCMakeLists.txt
@@ -2,43 +2,18 @@ cmake_minimum_required(VERSION 3.10)
 project(libvterm LANGUAGES C)
 
 include(GNUInstallDirs)
-find_package(Perl)
 
 if(MSVC)
-  add_compile_options(/W3)
   add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE)
 else()
-  add_compile_options(-Wall -std=c99)
+  add_compile_options(-std=c99)
 endif()
 
-# Generate includes from tables
-file(GLOB TBL_FILES ${CMAKE_SOURCE_DIR}/src/encoding/*.tbl)
-set(TBL_FILES_HEADERS)
-foreach(file ${TBL_FILES})
-  get_filename_component(basename ${file} NAME_WE)
-  set(tname encoding/${basename}.inc)
-  add_custom_command(OUTPUT
-    COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/encoding/
-    COMMAND ${CMAKE_COMMAND} -P ${CMAKE_SOURCE_DIR}/tbl2inc_c.cmake ${file} ${CMAKE_BINARY_DIR}/${tname}
-    COMMENT "Generating ${tname}"
-    OUTPUT ${CMAKE_BINARY_DIR}/${tname}
-    )
-  list(APPEND TBL_FILES_HEADERS ${tname})
-  # Only used for verifying that the output of tbl2inc_c.cmake is correct
-  set(tname encoding-test/${basename}.inc)
-  add_custom_command(OUTPUT
-    COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/encoding-test/
-    COMMAND ${PERL_EXECUTABLE} -CSD ${CMAKE_SOURCE_DIR}/tbl2inc_c.pl ${file} > ${CMAKE_BINARY_DIR}/${tname}
-    COMMENT "Generating ${tname}"
-    OUTPUT ${CMAKE_BINARY_DIR}/${tname}
-    )
-endforeach()
-
 include_directories(${CMAKE_SOURCE_DIR}/include)
 include_directories(${CMAKE_BINARY_DIR})
 
 file(GLOB VTERM_SOURCES ${CMAKE_SOURCE_DIR}/src/*.c)
-add_library(vterm ${VTERM_SOURCES} ${TBL_FILES_HEADERS})
+add_library(vterm ${VTERM_SOURCES})
 install(TARGETS vterm ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
 
 install(FILES include/vterm.h include/vterm_keycodes.h
@@ -54,33 +29,4 @@ if(NOT WIN32)
   endforeach()
 endif()
 
-# Tests
-add_executable(harness EXCLUDE_FROM_ALL t/harness.c)
-target_link_libraries(harness vterm)
-set_target_properties(harness PROPERTIES
-  # run-test.pl expects to find the harness in t/.libs/
-  RUNTIME_OUTPUT_DIRECTORY t/.libs)
-
-if(Perl_FOUND)
-  file(GLOB TESTFILES ${CMAKE_SOURCE_DIR}/t/*.test)
-  add_custom_target(check)
-  foreach(testfile ${TESTFILES})
-    get_filename_component(target_name ${testfile} NAME_WE)
-    add_custom_target(${target_name}
-      COMMAND ${PERL_EXECUTABLE} ${CMAKE_SOURCE_DIR}/t/run-test.pl ${testfile}
-      COMMENT "**${target_name} **"
-      DEPENDS harness)
-    add_dependencies(check ${target_name})
-  endforeach()
-
-  foreach(header_path ${TBL_FILES_HEADERS})
-    get_filename_component(header_name ${header_path} NAME)
-    set(perl_header_path ${CMAKE_BINARY_DIR}/encoding-test/${header_name})
-    add_custom_target(test-${header_name}
-      COMMAND ${CMAKE_COMMAND} -E compare_files
-              ${header_path} ${perl_header_path}
-      DEPENDS ${header_path} ${perl_header_path})
-  endforeach()
-endif()
-
 # vim: set ft=cmake:
diff --git a/cmake.deps/cmake/TreesitterCMakeLists.txt b/cmake.deps/cmake/TreesitterCMakeLists.txt
index 69372bd2b0..49fb19c96a 100644
--- a/cmake.deps/cmake/TreesitterCMakeLists.txt
+++ b/cmake.deps/cmake/TreesitterCMakeLists.txt
@@ -1,15 +1,9 @@
 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/src lib/include)
 
 install(FILES
   lib/include/tree_sitter/api.h
@@ -17,7 +11,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:
diff --git a/cmake.deps/cmake/TreesitterParserCMakeLists.txt b/cmake.deps/cmake/TreesitterParserCMakeLists.txt
index 44e4ef160f..9bdf500aa7 100644
--- a/cmake.deps/cmake/TreesitterParserCMakeLists.txt
+++ b/cmake.deps/cmake/TreesitterParserCMakeLists.txt
@@ -11,7 +11,6 @@ add_library(parser
 set_target_properties(
   parser
   PROPERTIES
-    POSITION_INDEPENDENT_CODE ON
     OUTPUT_NAME ${PARSERLANG}
     PREFIX ""
 )
diff --git a/cmake.deps/cmake/UnibiliumCMakeLists.txt b/cmake.deps/cmake/UnibiliumCMakeLists.txt
deleted file mode 100644
index 0a5d8481a7..0000000000
--- a/cmake.deps/cmake/UnibiliumCMakeLists.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-cmake_minimum_required(VERSION 3.10)
-project(unibilium LANGUAGES C)
-
-file(GLOB SRC_FILES ${PROJECT_SOURCE_DIR}/*.c)
-add_library(unibilium ${SRC_FILES})
-set_target_properties(unibilium PROPERTIES PUBLIC_HEADER ${PROJECT_SOURCE_DIR}/unibilium.h
-  VERSION "${VERSION_MAJOR}.${VERSION_MINOR}")
-
-if(NOT WIN32)
-  execute_process(COMMAND "shell ncursesw6-config --terminfo-dirs 2>/dev/null || \
-      ncurses6-config  --terminfo-dirs 2>/dev/null || \
-      ncursesw5-config --terminfo-dirs 2>/dev/null || \
-      ncurses5-config  --terminfo-dirs 2>/dev/null || \
-      echo '/etc/terminfo:/lib/terminfo:/usr/share/terminfo:/usr/lib/terminfo:/usr/local/share/terminfo:/usr/local/lib/terminfo'"
-    OUTPUT_VARIABLE TERMINFO_DIRS)
-else()
-  set(TERMINFO_DIRS "\"\"")
-endif()
-target_compile_definitions(unibilium PUBLIC TERMINFO_DIRS=${TERMINFO_DIRS})
-
-include(GNUInstallDirs)
-install(TARGETS unibilium
-  PUBLIC_HEADER
-  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-  PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
-
-# vim: set ft=cmake:
diff --git a/cmake.deps/cmake/libtermkeyCMakeLists.txt b/cmake.deps/cmake/libtermkeyCMakeLists.txt
index b419d38d7b..26c9d7730b 100644
--- a/cmake.deps/cmake/libtermkeyCMakeLists.txt
+++ b/cmake.deps/cmake/libtermkeyCMakeLists.txt
@@ -20,17 +20,4 @@ install(TARGETS termkey
   ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
   PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
 
-enable_testing()
-file(GLOB TESTSOURCES "t/[0-9]*.c")
-foreach(f ${TESTSOURCES})
-  get_filename_component(t ${f} NAME_WE)
-  if(${t} STREQUAL 05read)
-    continue()
-  endif()
-
-  add_executable("test_${t}" ${f} t/taplib.c)
-  target_link_libraries("test_${t}" termkey)
-  add_test("${t}" "test_${t}")
-endforeach()
-
 # vim: set ft=cmake: