aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames McCoy <jamessan@jamessan.com>2020-11-16 18:58:22 -0500
committerGitHub <noreply@github.com>2020-11-16 18:58:22 -0500
commitce70edb80e965c90fadafea72d758b4d2d531077 (patch)
tree3877e11e23b02fb3eb8eac8ff2a19be1c2076ddd
parentdd48198e62a06c95ec98cdf3f4296c8e5f539550 (diff)
parent4c6628a7eb3ec0711d8d118b044fb8c923400f03 (diff)
downloadrneovim-ce70edb80e965c90fadafea72d758b4d2d531077.tar.gz
rneovim-ce70edb80e965c90fadafea72d758b4d2d531077.tar.bz2
rneovim-ce70edb80e965c90fadafea72d758b4d2d531077.zip
Merge pull request #13302 from blueyed/fix-deps-luv-static
deps: fix BuildLuv without bundled libuv
-rw-r--r--third-party/cmake/BuildLuv.cmake4
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)