diff options
| author | dundargoc <33953936+dundargoc@users.noreply.github.com> | 2023-05-13 12:12:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-13 12:12:29 +0200 |
| commit | 10860164778327c0009f6efc8e020308cadb13a2 (patch) | |
| tree | 735513c4c2943080f5e554e8699f623fe6ecea06 /cmake.deps/cmake/BuildLuv.cmake | |
| parent | ed8c44f76762061e30cb8056483f55d38802eaef (diff) | |
| download | rneovim-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/BuildLuv.cmake')
| -rw-r--r-- | cmake.deps/cmake/BuildLuv.cmake | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/cmake.deps/cmake/BuildLuv.cmake b/cmake.deps/cmake/BuildLuv.cmake index 08168c9804..7220333de1 100644 --- a/cmake.deps/cmake/BuildLuv.cmake +++ b/cmake.deps/cmake/BuildLuv.cmake @@ -2,7 +2,6 @@ set(LUV_CMAKE_ARGS -D LUA_BUILD_TYPE=System -D LUA_COMPAT53_DIR=${DEPS_BUILD_DIR}/src/lua-compat-5.3 -D WITH_SHARED_LIBUV=ON - -D BUILD_SHARED_LIBS=OFF -D BUILD_STATIC_LIBS=ON -D BUILD_MODULE=OFF) @@ -38,7 +37,7 @@ ExternalProject_Add(lua-compat-5.3 BUILD_COMMAND "" INSTALL_COMMAND "") -ExternalProject_Add(luv-static +ExternalProject_Add(luv DEPENDS lua-compat-5.3 URL ${LUV_URL} URL_HASH SHA256=${LUV_SHA256} @@ -49,10 +48,10 @@ ExternalProject_Add(luv-static CMAKE_CACHE_ARGS ${DEPS_CMAKE_CACHE_ARGS}) if(USE_BUNDLED_LUAJIT) - add_dependencies(luv-static luajit) + add_dependencies(luv luajit) elseif(USE_BUNDLED_LUA) - add_dependencies(luv-static lua) + add_dependencies(luv lua) endif() if(USE_BUNDLED_LIBUV) - add_dependencies(luv-static libuv) + add_dependencies(luv libuv) endif() |