diff options
| author | dundargoc <33953936+dundargoc@users.noreply.github.com> | 2023-04-15 22:39:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-15 22:39:30 +0200 |
| commit | c8667c8756a211b8597e2e0a80200498b752915d (patch) | |
| tree | 83d19a78b6692945380751f6f469dba68c52e6b8 | |
| parent | 8c6f97bef89da6ad8bde8f935d9983f25b5c59bd (diff) | |
| download | rneovim-c8667c8756a211b8597e2e0a80200498b752915d.tar.gz rneovim-c8667c8756a211b8597e2e0a80200498b752915d.tar.bz2 rneovim-c8667c8756a211b8597e2e0a80200498b752915d.zip | |
build: various cmake fixes
- Remove unused function argument from GetBinaryDeps
- Remove unused variable LUA_LOAD_PACKAGE_MODULE_SOURCE
- Add LUA_FS_MODULE_SOURCE as a dependency of VIM_MODULE_FILE
| -rw-r--r-- | cmake.deps/cmake/BuildLuarocks.cmake | 2 | ||||
| -rw-r--r-- | cmake.deps/cmake/GetBinaryDeps.cmake | 2 | ||||
| -rwxr-xr-x | src/nvim/CMakeLists.txt | 26 |
3 files changed, 15 insertions, 15 deletions
diff --git a/cmake.deps/cmake/BuildLuarocks.cmake b/cmake.deps/cmake/BuildLuarocks.cmake index 674a7eaee1..9c4f2d08eb 100644 --- a/cmake.deps/cmake/BuildLuarocks.cmake +++ b/cmake.deps/cmake/BuildLuarocks.cmake @@ -1,7 +1,7 @@ # Luarocks recipe. Luarocks is only required when building Neovim. # NOTE: LuaRocks rocks need to "DEPENDS" on the previous module, because # running luarocks in parallel will break, e.g. when some rocks have -# the same dependency.. +# the same dependency. option(USE_BUNDLED_BUSTED "Use the bundled version of busted to run tests." ON) diff --git a/cmake.deps/cmake/GetBinaryDeps.cmake b/cmake.deps/cmake/GetBinaryDeps.cmake index 48e66363d3..a98f0f5062 100644 --- a/cmake.deps/cmake/GetBinaryDeps.cmake +++ b/cmake.deps/cmake/GetBinaryDeps.cmake @@ -5,7 +5,7 @@ # install root. function(GetBinaryDep) cmake_parse_arguments(_gettool - "BUILD_IN_SOURCE" + "" "TARGET" "INSTALL_COMMAND" ${ARGN}) diff --git a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt index d685e9feed..2efcb9486a 100755 --- a/src/nvim/CMakeLists.txt +++ b/src/nvim/CMakeLists.txt @@ -498,28 +498,28 @@ add_custom_command( COMMAND ${CMAKE_COMMAND} -E env "LUAC_PRG=${LUAC_PRG}" ${LUA_PRG} ${CHAR_BLOB_GENERATOR} -c ${VIM_MODULE_FILE} + ${LUA_EDITOR_MODULE_SOURCE} "vim._editor" + ${LUA_FILETYPE_MODULE_SOURCE} "vim.filetype" + ${LUA_FS_MODULE_SOURCE} "vim.fs" + ${LUA_F_MODULE_SOURCE} "vim.F" ${LUA_INIT_PACKAGES_MODULE_SOURCE} "vim._init_packages" ${LUA_INSPECT_MODULE_SOURCE} "vim.inspect" - ${LUA_FS_MODULE_SOURCE} "vim.fs" - ${LUA_EDITOR_MODULE_SOURCE} "vim._editor" - ${LUA_SHARED_MODULE_SOURCE} "vim.shared" + ${LUA_KEYMAP_MODULE_SOURCE} "vim.keymap" ${LUA_LOADER_MODULE_SOURCE} "vim.loader" - ${LUA_F_MODULE_SOURCE} "vim.F" ${LUA_META_MODULE_SOURCE} "vim._meta" - ${LUA_FILETYPE_MODULE_SOURCE} "vim.filetype" - ${LUA_KEYMAP_MODULE_SOURCE} "vim.keymap" + ${LUA_SHARED_MODULE_SOURCE} "vim.shared" DEPENDS ${CHAR_BLOB_GENERATOR} - ${LUA_INIT_PACKAGES_MODULE_SOURCE} ${LUA_EDITOR_MODULE_SOURCE} - ${LUA_SHARED_MODULE_SOURCE} - ${LUA_LOADER_MODULE_SOURCE} - ${LUA_INSPECT_MODULE_SOURCE} - ${LUA_F_MODULE_SOURCE} - ${LUA_META_MODULE_SOURCE} ${LUA_FILETYPE_MODULE_SOURCE} - ${LUA_LOAD_PACKAGE_MODULE_SOURCE} + ${LUA_FS_MODULE_SOURCE} + ${LUA_F_MODULE_SOURCE} + ${LUA_INIT_PACKAGES_MODULE_SOURCE} + ${LUA_INSPECT_MODULE_SOURCE} ${LUA_KEYMAP_MODULE_SOURCE} + ${LUA_LOADER_MODULE_SOURCE} + ${LUA_META_MODULE_SOURCE} + ${LUA_SHARED_MODULE_SOURCE} VERBATIM ) |