aboutsummaryrefslogtreecommitdiff
path: root/cmake.deps
diff options
context:
space:
mode:
authorChristian Clason <c.clason@uni-graz.at>2024-08-08 12:28:47 +0200
committerChristian Clason <c.clason@uni-graz.at>2024-08-10 10:26:07 +0200
commitfa79a8ad6deefeea81c1959d69aa4c8b2d993f99 (patch)
tree256b79397d0266ba796c250ceac1a5256ad5187d /cmake.deps
parent0ec43cb4b56673d661d6bd1e39836d0a891be5cd (diff)
downloadrneovim-fa79a8ad6deefeea81c1959d69aa4c8b2d993f99.tar.gz
rneovim-fa79a8ad6deefeea81c1959d69aa4c8b2d993f99.tar.bz2
rneovim-fa79a8ad6deefeea81c1959d69aa4c8b2d993f99.zip
build(deps): vendor libvterm at v0.3.3
Problem: Adding support for modern Nvim features (reflow, OSC 8, full utf8/emoji support) requires coupling libvterm to Nvim internals (e.g., utf8proc). Solution: Vendor libvterm at v0.3.3.
Diffstat (limited to 'cmake.deps')
-rw-r--r--cmake.deps/CMakeLists.txt5
-rw-r--r--cmake.deps/CMakePresets.json1
-rw-r--r--cmake.deps/cmake/BuildLibvterm.cmake8
-rw-r--r--cmake.deps/cmake/LibvtermCMakeLists.txt28
-rw-r--r--cmake.deps/deps.txt3
5 files changed, 0 insertions, 45 deletions
diff --git a/cmake.deps/CMakeLists.txt b/cmake.deps/CMakeLists.txt
index 05db090765..43f50b4485 100644
--- a/cmake.deps/CMakeLists.txt
+++ b/cmake.deps/CMakeLists.txt
@@ -27,7 +27,6 @@ set(DEPS_IGNORE_SHA FALSE)
option(USE_BUNDLED "Use bundled dependencies." ON)
option(USE_BUNDLED_LIBUV "Use the bundled libuv." ${USE_BUNDLED})
-option(USE_BUNDLED_LIBVTERM "Use the bundled libvterm." ${USE_BUNDLED})
option(USE_BUNDLED_LPEG "Use the bundled lpeg." ${USE_BUNDLED})
# PUC Lua is only used for tests, unless explicitly requested.
option(USE_BUNDLED_LUA "Use the bundled version of lua." OFF)
@@ -96,10 +95,6 @@ if(USE_BUNDLED_UNIBILIUM)
include(BuildUnibilium)
endif()
-if(USE_BUNDLED_LIBVTERM)
- include(BuildLibvterm)
-endif()
-
if(USE_BUNDLED_LIBUV)
include(BuildLibuv)
endif()
diff --git a/cmake.deps/CMakePresets.json b/cmake.deps/CMakePresets.json
index 7d9f473581..043124c29c 100644
--- a/cmake.deps/CMakePresets.json
+++ b/cmake.deps/CMakePresets.json
@@ -16,7 +16,6 @@
"description": "Build neovim with external deps on ubuntu",
"cacheVariables": {
"USE_BUNDLED":"OFF",
- "USE_BUNDLED_LIBVTERM":"ON",
"USE_BUNDLED_TS":"ON",
"USE_BUNDLED_UTF8PROC":"ON"
},
diff --git a/cmake.deps/cmake/BuildLibvterm.cmake b/cmake.deps/cmake/BuildLibvterm.cmake
deleted file mode 100644
index 3415d8debe..0000000000
--- a/cmake.deps/cmake/BuildLibvterm.cmake
+++ /dev/null
@@ -1,8 +0,0 @@
-get_externalproject_options(libvterm ${DEPS_IGNORE_SHA})
-ExternalProject_Add(libvterm
- DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}/libvterm
- 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}
- ${EXTERNALPROJECT_OPTIONS})
diff --git a/cmake.deps/cmake/LibvtermCMakeLists.txt b/cmake.deps/cmake/LibvtermCMakeLists.txt
deleted file mode 100644
index c197523786..0000000000
--- a/cmake.deps/cmake/LibvtermCMakeLists.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-cmake_minimum_required(VERSION 3.13)
-project(libvterm C)
-
-add_compile_options(-w)
-
-include(GNUInstallDirs)
-
-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})
-install(TARGETS vterm ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
-
-install(FILES include/vterm.h include/vterm_keycodes.h
- DESTINATION include)
-
-if(NOT WIN32)
- file(GLOB BIN_SOURCES ${CMAKE_SOURCE_DIR}/bin/*.c)
- foreach(EXE_C ${BIN_SOURCES})
- get_filename_component(target_name ${EXE_C} NAME_WE)
- add_executable(${target_name} ${EXE_C})
- target_link_libraries(${target_name} vterm)
- install(TARGETS ${target_name} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
- endforeach()
-endif()
-
-# vim: set ft=cmake:
diff --git a/cmake.deps/deps.txt b/cmake.deps/deps.txt
index 63ec369f76..03e10f2026 100644
--- a/cmake.deps/deps.txt
+++ b/cmake.deps/deps.txt
@@ -10,9 +10,6 @@ LUA_SHA256 2640fc56a795f29d28ef15e13c34a47e223960b0240e8cb0a82d9b0738695333
UNIBILIUM_URL https://github.com/neovim/unibilium/archive/d72c3598e7ac5d1ebf86ee268b8b4ed95c0fa628.tar.gz
UNIBILIUM_SHA256 9c4747c862ab5e3076dcf8fa8f0ea7a6b50f20ec5905618b9536655596797487
-LIBVTERM_URL https://github.com/neovim/libvterm/archive/0a15c6e983b0db7ef8276e0792414a805d01bdaf.tar.gz
-LIBVTERM_SHA256 c4683e7a2d71c04781fd0ab7719a94202800e97a9e091514c16983bb732b0fa7
-
LUV_URL https://github.com/luvit/luv/releases/download/1.48.0-2/luv-1.48.0-2.tar.gz
LUV_SHA256 2c3a1ddfebb4f6550293a40ee789f7122e97647eede51511f57203de48c03b7a