diff options
Diffstat (limited to 'third-party/cmake')
| -rw-r--r-- | third-party/cmake/BuildLibuv.cmake | 2 | ||||
| -rw-r--r-- | third-party/cmake/BuildLibvterm.cmake | 2 | ||||
| -rw-r--r-- | third-party/cmake/BuildLua.cmake | 2 | ||||
| -rw-r--r-- | third-party/cmake/BuildLuajit.cmake | 2 | ||||
| -rw-r--r-- | third-party/cmake/BuildLuarocks.cmake | 5 | ||||
| -rw-r--r-- | third-party/cmake/BuildLuv.cmake | 2 | ||||
| -rw-r--r-- | third-party/cmake/BuildMsgpack.cmake | 2 | ||||
| -rw-r--r-- | third-party/cmake/BuildTreesitter.cmake | 2 | ||||
| -rw-r--r-- | third-party/cmake/GetBinaryDeps.cmake | 3 |
9 files changed, 5 insertions, 17 deletions
diff --git a/third-party/cmake/BuildLibuv.cmake b/third-party/cmake/BuildLibuv.cmake index c5f7d6d5ab..32fe2659a4 100644 --- a/third-party/cmake/BuildLibuv.cmake +++ b/third-party/cmake/BuildLibuv.cmake @@ -1,5 +1,3 @@ -include(CMakeParseArguments) - # BuildLibuv(TARGET targetname CONFIGURE_COMMAND ... BUILD_COMMAND ... INSTALL_COMMAND ...) # Reusable function to build libuv, wraps ExternalProject_Add. # Failing to pass a command argument will result in no command being run diff --git a/third-party/cmake/BuildLibvterm.cmake b/third-party/cmake/BuildLibvterm.cmake index c3485dac25..09f2ba7f2c 100644 --- a/third-party/cmake/BuildLibvterm.cmake +++ b/third-party/cmake/BuildLibvterm.cmake @@ -1,5 +1,3 @@ -include(CMakeParseArguments) - # BuildLibvterm(CONFIGURE_COMMAND ... BUILD_COMMAND ... INSTALL_COMMAND ...) # Failing to pass a command argument will result in no command being run function(BuildLibvterm) diff --git a/third-party/cmake/BuildLua.cmake b/third-party/cmake/BuildLua.cmake index c3f789509e..a40cb7dcb2 100644 --- a/third-party/cmake/BuildLua.cmake +++ b/third-party/cmake/BuildLua.cmake @@ -1,5 +1,3 @@ -include(CMakeParseArguments) - # BuildLua(CONFIGURE_COMMAND ... BUILD_COMMAND ... INSTALL_COMMAND ...) # Reusable function to build lua, wraps ExternalProject_Add. # Failing to pass a command argument will result in no command being run diff --git a/third-party/cmake/BuildLuajit.cmake b/third-party/cmake/BuildLuajit.cmake index ca41a7cee3..512d5ef5ae 100644 --- a/third-party/cmake/BuildLuajit.cmake +++ b/third-party/cmake/BuildLuajit.cmake @@ -1,5 +1,3 @@ -include(CMakeParseArguments) - # BuildLuajit(TARGET targetname CONFIGURE_COMMAND ... BUILD_COMMAND ... INSTALL_COMMAND ...) # Reusable function to build luajit, wraps ExternalProject_Add. # Failing to pass a command argument will result in no command being run diff --git a/third-party/cmake/BuildLuarocks.cmake b/third-party/cmake/BuildLuarocks.cmake index a961ec69c7..0cef37736d 100644 --- a/third-party/cmake/BuildLuarocks.cmake +++ b/third-party/cmake/BuildLuarocks.cmake @@ -202,6 +202,11 @@ if(USE_BUNDLED_BUSTED) set(LUV_ARGS "CFLAGS=-O0 -g3 -fPIC") if(USE_BUNDLED_LIBUV) list(APPEND LUV_ARGS LIBUV_DIR=${HOSTDEPS_INSTALL_DIR}) + # workaround for bug introduced in + # https://github.com/luarocks/luarocks/commit/83126ba324846b754ffc5e0345341f01262b3f86 + if(MSVC) + list(APPEND LUV_ARGS LIBUV_LIBDIR=${HOSTDEPS_INSTALL_DIR}/lib) + endif() endif() SET(LUV_PRIVATE_ARGS LUA_COMPAT53_INCDIR=${DEPS_BUILD_DIR}/src/lua-compat-5.3/c-api) add_custom_command(OUTPUT ${ROCKS_DIR}/luv diff --git a/third-party/cmake/BuildLuv.cmake b/third-party/cmake/BuildLuv.cmake index f5d45c7ff7..69f3b60ecf 100644 --- a/third-party/cmake/BuildLuv.cmake +++ b/third-party/cmake/BuildLuv.cmake @@ -1,5 +1,3 @@ -include(CMakeParseArguments) - # BuildLuv(PATCH_COMMAND ... CONFIGURE_COMMAND ... BUILD_COMMAND ... INSTALL_COMMAND ...) # Reusable function to build luv, wraps ExternalProject_Add. # Failing to pass a command argument will result in no command being run diff --git a/third-party/cmake/BuildMsgpack.cmake b/third-party/cmake/BuildMsgpack.cmake index 30af5f060b..39a8a64d23 100644 --- a/third-party/cmake/BuildMsgpack.cmake +++ b/third-party/cmake/BuildMsgpack.cmake @@ -1,5 +1,3 @@ -include(CMakeParseArguments) - # BuildMsgpack(CONFIGURE_COMMAND ... BUILD_COMMAND ... INSTALL_COMMAND ...) # Reusable function to build msgpack, wraps ExternalProject_Add. # Failing to pass a command argument will result in no command being run diff --git a/third-party/cmake/BuildTreesitter.cmake b/third-party/cmake/BuildTreesitter.cmake index a55b2e36e8..0aa2706d7d 100644 --- a/third-party/cmake/BuildTreesitter.cmake +++ b/third-party/cmake/BuildTreesitter.cmake @@ -1,5 +1,3 @@ -include(CMakeParseArguments) - # BuildTreeSitter(TARGET targetname CONFIGURE_COMMAND ... BUILD_COMMAND ... INSTALL_COMMAND ...) function(BuildTreeSitter) cmake_parse_arguments(_treesitter diff --git a/third-party/cmake/GetBinaryDeps.cmake b/third-party/cmake/GetBinaryDeps.cmake index 982bf62265..04e3f95a29 100644 --- a/third-party/cmake/GetBinaryDeps.cmake +++ b/third-party/cmake/GetBinaryDeps.cmake @@ -1,6 +1,3 @@ -# Download and install binary dependencies for windows -include(CMakeParseArguments) - # This is similar to the build recipes, but instead downloads a third party # binary and installs it under the DEPS_PREFIX. # The INSTALL_COMMAND is executed in the folder where downloaded files are |