From 4c6628a7eb3ec0711d8d118b044fb8c923400f03 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Mon, 16 Nov 2020 13:47:19 +0100 Subject: [PATCH] deps: fix BuildLuv without bundled libuv Fixes: % rm -rf .deps % cmake -DUSE_BUNDLED_LUV=ON -DUSE_BUNDLED=OFF -S third-party -B .deps % cmake --build .deps ... [ 50%] Building C object CMakeFiles/luv.dir/src/luv.c.o /home/daniel/Vcs/neovim/.deps/build/src/luv/src/luv.c:20:10: fatal error: c-api/compat-5.3.h: No such file or directory 20 | #include "c-api/compat-5.3.h" | ^~~~~~~~~~~~~~~~~~~~ compilation terminated. This was broken since 78f1eccc8, where apparently the `LUA_COMPAT53_DIR` was defined in a wrong location. --- third-party/cmake/BuildLuv.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/third-party/cmake/BuildLuv.cmake b/third-party/cmake/BuildLuv.cmake index ab3e2190ab..ac4196f910 100644 --- a/third-party/cmake/BuildLuv.cmake +++ b/third-party/cmake/BuildLuv.cmake @@ -68,6 +68,7 @@ set(LUV_CONFIGURE_COMMAND_COMMON -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=${DEPS_INSTALL_DIR} -DLUA_BUILD_TYPE=System + -DLUA_COMPAT53_DIR=${DEPS_BUILD_DIR}/src/lua-compat-5.3 -DWITH_SHARED_LIBUV=ON -DBUILD_SHARED_LIBS=OFF -DBUILD_MODULE=OFF) @@ -88,8 +89,7 @@ endif() if(USE_BUNDLED_LIBUV) set(LUV_CONFIGURE_COMMAND_COMMON ${LUV_CONFIGURE_COMMAND_COMMON} - -DCMAKE_PREFIX_PATH=${DEPS_INSTALL_DIR} - -DLUA_COMPAT53_DIR=${DEPS_BUILD_DIR}/src/lua-compat-5.3) + -DCMAKE_PREFIX_PATH=${DEPS_INSTALL_DIR}) endif() if(MINGW AND CMAKE_CROSSCOMPILING)