aboutsummaryrefslogtreecommitdiff
path: root/cmake.deps/cmake/BuildLuarocks.cmake
diff options
context:
space:
mode:
authordundargoc <33953936+dundargoc@users.noreply.github.com>2023-05-13 12:12:29 +0200
committerGitHub <noreply@github.com>2023-05-13 12:12:29 +0200
commit10860164778327c0009f6efc8e020308cadb13a2 (patch)
tree735513c4c2943080f5e554e8699f623fe6ecea06 /cmake.deps/cmake/BuildLuarocks.cmake
parented8c44f76762061e30cb8056483f55d38802eaef (diff)
downloadrneovim-10860164778327c0009f6efc8e020308cadb13a2.tar.gz
rneovim-10860164778327c0009f6efc8e020308cadb13a2.tar.bz2
rneovim-10860164778327c0009f6efc8e020308cadb13a2.zip
build: cmake cleanup
- Simplify error checking when using execute_process. - Set BUILD_SHARED_LIBS to OFF when building dependencies. This is normally not needed, but msgpack interprets an unset BUILD_SHARED_LIBS to build a shared library, which is the opposite of the cmake behavior. - Move function check_lua_module to Util.cmake. - Remove unnecessary code. - Make variable naming more consistent
Diffstat (limited to 'cmake.deps/cmake/BuildLuarocks.cmake')
-rw-r--r--cmake.deps/cmake/BuildLuarocks.cmake6
1 files changed, 3 insertions, 3 deletions
diff --git a/cmake.deps/cmake/BuildLuarocks.cmake b/cmake.deps/cmake/BuildLuarocks.cmake
index d45776f5b1..5725507c36 100644
--- a/cmake.deps/cmake/BuildLuarocks.cmake
+++ b/cmake.deps/cmake/BuildLuarocks.cmake
@@ -1,4 +1,4 @@
-# Luarocks recipe. Luarocks is only required when building Neovim.
+# Luarocks recipe. Luarocks is only required when testing 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.
@@ -31,7 +31,7 @@ if(UNIX)
find_package(Luajit)
if(LUAJIT_FOUND)
list(APPEND LUAROCKS_OPTS
- --with-lua-include=${LUAJIT_INCLUDE_DIRS}
+ --with-lua-include=${LUAJIT_INCLUDE_DIR}
--with-lua-interpreter=luajit)
endif()
@@ -46,7 +46,7 @@ if(UNIX)
OUTPUT_VARIABLE LUA_VERSION
ERROR_VARIABLE ERR
RESULT_VARIABLE RES)
- if(NOT RES EQUAL 0)
+ if(RES)
message(FATAL_ERROR "Could not get LUA_VERSION with ${LUA_EXE}: ${ERR}")
endif()
endif()