Skip to content

Commit 903683d

Browse files
gikarisassanh
authored andcommitted
feat: use forked neovim-qt with qt6 support
To build against Qt6 we need neovim-qt to support it. It is currently in progress and will take some time. Before that, we can use a fork with all the patches we need, while contributing them upstream, if possible, and waiting for the main project to be ready.
1 parent fe917f3 commit 903683d

File tree

4 files changed

+2
-70
lines changed

4 files changed

+2
-70
lines changed

LICENSES/ISC.txt

Lines changed: 0 additions & 8 deletions
This file was deleted.

external/neovim-qt/CMakeLists.txt

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,16 @@
33

44
include(FetchContent)
55

6-
find_package(Git QUIET)
7-
8-
file(GLOB NEOVIM_QT_PATCHES "${CMAKE_CURRENT_SOURCE_DIR}/patches/*.patch")
9-
106
FetchContent_Declare(
117
neovimqt
12-
GIT_REPOSITORY https://github.com/equalsraf/neovim-qt.git
13-
GIT_TAG 3f05de82ecb5c1a24a7572081ae59e419eb059b8 # 0.2.17
14-
PATCH_COMMAND ${GIT_EXECUTABLE} restore . && ${GIT_EXECUTABLE} apply ${NEOVIM_QT_PATCHES}
8+
GIT_REPOSITORY https://github.com/gikari/neovim-qt.git
9+
GIT_TAG c84f81712639140f910a1d38acb8edcb4509dc4d # qt6 branch
1510
)
1611

1712
FetchContent_GetProperties(neovimqt)
1813
if(NOT neovimqt_POPULATED)
1914
FetchContent_Populate(neovimqt)
2015

21-
set(ENABLE_TESTS OFF CACHE INTERNAL "Turn off tests")
22-
2316
# We use this, instead of MakeAvailable,
2417
# so that neovimqt is not installed in CI artifacts
2518
add_subdirectory(${neovimqt_SOURCE_DIR} ${neovimqt_BINARY_DIR} EXCLUDE_FROM_ALL)

external/neovim-qt/patches/0001-fix-share-current-directory-to-interface-includes.patch

Lines changed: 0 additions & 24 deletions
This file was deleted.

external/neovim-qt/patches/0002-fix-use-current-project-directory-for-icons-install.patch

Lines changed: 0 additions & 29 deletions
This file was deleted.

0 commit comments

Comments
 (0)