diff options
| author | Björn Linse <bjorn.linse@gmail.com> | 2016-08-31 21:39:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-31 21:39:42 +0200 |
| commit | 0ade1bb7067d0cdb9b059fb66a8c4b868408be9c (patch) | |
| tree | 36c02a63f28bef74b6f8a3cf891267912867e193 /third-party | |
| parent | 7fd771619f2a2e2fe6007aaa6aa9a02cbdd205bd (diff) | |
| parent | 9ce81f7b2b90846063f6bd4a5ce8efc61e437983 (diff) | |
| download | rneovim-0ade1bb7067d0cdb9b059fb66a8c4b868408be9c.tar.gz rneovim-0ade1bb7067d0cdb9b059fb66a8c4b868408be9c.tar.bz2 rneovim-0ade1bb7067d0cdb9b059fb66a8c4b868408be9c.zip | |
Merge pull request #5225 from equalsraf/windows-functionaltests
Enable functional tests in Appveyor
Diffstat (limited to 'third-party')
| -rw-r--r-- | third-party/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | third-party/cmake/BuildLuarocks.cmake | 19 |
2 files changed, 12 insertions, 11 deletions
diff --git a/third-party/CMakeLists.txt b/third-party/CMakeLists.txt index 7eba17aba3..2e41d745d7 100644 --- a/third-party/CMakeLists.txt +++ b/third-party/CMakeLists.txt @@ -81,8 +81,8 @@ endif() include(ExternalProject) -set(LIBUV_URL https://github.com/libuv/libuv/archive/v1.8.0.tar.gz) -set(LIBUV_SHA256 906e1a5c673c95cb261adeacdb7308a65b4a8f7c9c50d85f3021364951fa9cde) +set(LIBUV_URL https://github.com/libuv/libuv/archive/v1.9.1.tar.gz) +set(LIBUV_SHA256 a6ca9f0648973d1463f46b495ce546ddcbe7cce2f04b32e802a15539e46c57ad) set(MSGPACK_URL https://github.com/msgpack/msgpack-c/archive/cpp-1.0.0.tar.gz) set(MSGPACK_SHA256 afda64ca445203bb7092372b822bae8b2539fdcebbfc3f753f393628c2bcfe7d) diff --git a/third-party/cmake/BuildLuarocks.cmake b/third-party/cmake/BuildLuarocks.cmake index cbc1959d4f..fee8dba207 100644 --- a/third-party/cmake/BuildLuarocks.cmake +++ b/third-party/cmake/BuildLuarocks.cmake @@ -3,11 +3,7 @@ # writing a recipe that is meant for cross-compile, use the HOSTDEPS_* variables # instead of DEPS_* - check the main CMakeLists.txt for a list. -if(MSVC OR (MINGW AND NOT CMAKE_CROSSCOMPILING)) - message(STATUS "Building busted in Windows is not supported (skipping)") -else() - option(USE_BUNDLED_BUSTED "Use the bundled version of busted to run tests." ON) -endif() +option(USE_BUNDLED_BUSTED "Use the bundled version of busted to run tests." ON) # BuildLuarocks(CONFIGURE_COMMAND ... BUILD_COMMAND ... INSTALL_COMMAND ...) # Reusable function to build luarocks, wraps ExternalProject_Add. @@ -134,12 +130,17 @@ if(USE_BUNDLED_BUSTED) add_custom_target(penlight DEPENDS ${HOSTDEPS_LIB_DIR}/luarocks/rocks/penlight/1.3.2-2) - add_custom_command(OUTPUT ${HOSTDEPS_BIN_DIR}/busted + if(WIN32) + set(BUSTED_EXE "${HOSTDEPS_BIN_DIR}/busted.bat") + else() + set(BUSTED_EXE "${HOSTDEPS_BIN_DIR}/busted") + endif() + add_custom_command(OUTPUT ${BUSTED_EXE} COMMAND ${LUAROCKS_BINARY} ARGS build https://raw.githubusercontent.com/Olivine-Labs/busted/v2.0.rc11-0/busted-2.0.rc11-0.rockspec ${LUAROCKS_BUILDARGS} DEPENDS penlight) add_custom_target(busted - DEPENDS ${HOSTDEPS_BIN_DIR}/busted) + DEPENDS ${BUSTED_EXE}) add_custom_command(OUTPUT ${HOSTDEPS_BIN_DIR}/luacheck COMMAND ${LUAROCKS_BINARY} @@ -152,9 +153,9 @@ if(USE_BUNDLED_BUSTED) if(MINGW AND CMAKE_CROSSCOMPILING) set(LUV_DEPS ${LUV_DEPS} libuv_host) endif() - set(LUV_ARGS CFLAGS='-O0 -g3 -fPIC') + set(LUV_ARGS "CFLAGS=-O0 -g3 -fPIC") if(USE_BUNDLED_LIBUV) - set(LUV_ARGS LIBUV_DIR=${HOSTDEPS_INSTALL_DIR} CFLAGS='-O0 -g3 -fPIC') + list(APPEND LUV_ARGS LIBUV_DIR=${HOSTDEPS_INSTALL_DIR}) endif() add_custom_command(OUTPUT ${HOSTDEPS_LIB_DIR}/luarocks/rocks/luv COMMAND ${LUAROCKS_BINARY} |