diff options
| author | Daniel Hahler <git@thequod.de> | 2020-11-16 13:47:19 +0100 |
|---|---|---|
| committer | Daniel Hahler <git@thequod.de> | 2020-11-16 13:52:50 +0100 |
| commit | 4c6628a7eb3ec0711d8d118b044fb8c923400f03 (patch) | |
| tree | 6e12d6f5afd798c240a5ba7648ab01535d812327 | |
| parent | 6169167f90ba316b01cc64046ca46774bb1a22d7 (diff) | |
| download | rneovim-4c6628a7eb3ec0711d8d118b044fb8c923400f03.tar.gz rneovim-4c6628a7eb3ec0711d8d118b044fb8c923400f03.tar.bz2 rneovim-4c6628a7eb3ec0711d8d118b044fb8c923400f03.zip | |
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.
| -rw-r--r-- | third-party/cmake/BuildLuv.cmake | 4 |
1 files 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) |