aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Szakmeister <john@szakmeister.net>2015-03-10 06:04:06 -0400
committerJohn Szakmeister <john@szakmeister.net>2015-03-10 06:04:06 -0400
commite1ad8ae7240c8535e4beb0a2e8e35acfb571b7af (patch)
tree1f81f97de5493fbc7db757de0d532ba802dceba6
parent51c6f38fcac82fb56965548631e913e8347dbe6a (diff)
downloadrneovim-e1ad8ae7240c8535e4beb0a2e8e35acfb571b7af.tar.gz
rneovim-e1ad8ae7240c8535e4beb0a2e8e35acfb571b7af.tar.bz2
rneovim-e1ad8ae7240c8535e4beb0a2e8e35acfb571b7af.zip
third-party: fix some whitespace issues from the recent splitting
-rw-r--r--third-party/cmake/BuildLibtermkey.cmake2
-rw-r--r--third-party/cmake/BuildLibunibilium.cmake3
-rw-r--r--third-party/cmake/BuildLibuv.cmake3
-rw-r--r--third-party/cmake/BuildLibvterm.cmake3
-rw-r--r--third-party/cmake/BuildLuajit.cmake3
-rw-r--r--third-party/cmake/BuildLuarocks.cmake6
6 files changed, 8 insertions, 12 deletions
diff --git a/third-party/cmake/BuildLibtermkey.cmake b/third-party/cmake/BuildLibtermkey.cmake
index 43ecc52538..fe8c8af84b 100644
--- a/third-party/cmake/BuildLibtermkey.cmake
+++ b/third-party/cmake/BuildLibtermkey.cmake
@@ -1,4 +1,3 @@
-
ExternalProject_Add(libtermkey
PREFIX ${DEPS_BUILD_DIR}
URL ${LIBTERMKEY_URL}
@@ -18,5 +17,6 @@ ExternalProject_Add(libtermkey
PKG_CONFIG_PATH=${DEPS_LIB_DIR}/pkgconfig
CFLAGS=-fPIC
install)
+
list(APPEND THIRD_PARTY_DEPS libtermkey)
add_dependencies(libtermkey libunibilium)
diff --git a/third-party/cmake/BuildLibunibilium.cmake b/third-party/cmake/BuildLibunibilium.cmake
index 3fb212b2a0..c112995819 100644
--- a/third-party/cmake/BuildLibunibilium.cmake
+++ b/third-party/cmake/BuildLibunibilium.cmake
@@ -1,4 +1,3 @@
-
ExternalProject_Add(libunibilium
PREFIX ${DEPS_BUILD_DIR}
URL ${LIBUNIBILIUM_URL}
@@ -16,5 +15,5 @@ ExternalProject_Add(libunibilium
PREFIX=${DEPS_INSTALL_DIR}
CFLAGS=-fPIC
INSTALL_COMMAND ${MAKE_PRG} PREFIX=${DEPS_INSTALL_DIR} install)
-list(APPEND THIRD_PARTY_DEPS libunibilium)
+list(APPEND THIRD_PARTY_DEPS libunibilium)
diff --git a/third-party/cmake/BuildLibuv.cmake b/third-party/cmake/BuildLibuv.cmake
index df5517a17e..3033f82e96 100644
--- a/third-party/cmake/BuildLibuv.cmake
+++ b/third-party/cmake/BuildLibuv.cmake
@@ -1,4 +1,3 @@
-
ExternalProject_Add(libuv
PREFIX ${DEPS_BUILD_DIR}
URL ${LIBUV_URL}
@@ -15,5 +14,5 @@ ExternalProject_Add(libuv
--prefix=${DEPS_INSTALL_DIR} --libdir=${DEPS_INSTALL_DIR}/lib
CC=${DEPS_C_COMPILER}
INSTALL_COMMAND ${MAKE_PRG} install)
-list(APPEND THIRD_PARTY_DEPS libuv)
+list(APPEND THIRD_PARTY_DEPS libuv)
diff --git a/third-party/cmake/BuildLibvterm.cmake b/third-party/cmake/BuildLibvterm.cmake
index aca48046bc..6bdb085452 100644
--- a/third-party/cmake/BuildLibvterm.cmake
+++ b/third-party/cmake/BuildLibvterm.cmake
@@ -1,4 +1,3 @@
-
ExternalProject_Add(libvterm
PREFIX ${DEPS_BUILD_DIR}
URL ${LIBVTERM_URL}
@@ -17,5 +16,5 @@ ExternalProject_Add(libvterm
PREFIX=${DEPS_INSTALL_DIR}
CFLAGS=-fPIC
install)
-list(APPEND THIRD_PARTY_DEPS libvterm)
+list(APPEND THIRD_PARTY_DEPS libvterm)
diff --git a/third-party/cmake/BuildLuajit.cmake b/third-party/cmake/BuildLuajit.cmake
index b2548bd182..39207eb8b8 100644
--- a/third-party/cmake/BuildLuajit.cmake
+++ b/third-party/cmake/BuildLuajit.cmake
@@ -1,4 +1,3 @@
-
ExternalProject_Add(luajit
PREFIX ${DEPS_BUILD_DIR}
URL ${LUAJIT_URL}
@@ -22,5 +21,5 @@ ExternalProject_Add(luajit
CCDEBUG+=-g
BUILDMODE=static
install)
-list(APPEND THIRD_PARTY_DEPS luajit)
+list(APPEND THIRD_PARTY_DEPS luajit)
diff --git a/third-party/cmake/BuildLuarocks.cmake b/third-party/cmake/BuildLuarocks.cmake
index 796e324297..e83f4015b5 100644
--- a/third-party/cmake/BuildLuarocks.cmake
+++ b/third-party/cmake/BuildLuarocks.cmake
@@ -1,9 +1,9 @@
-
if(USE_BUNDLED_LUAJIT)
list(APPEND LUAROCKS_OPTS
--with-lua=${DEPS_INSTALL_DIR}
--with-lua-include=${DEPS_INSTALL_DIR}/include/luajit-2.0)
endif()
+
ExternalProject_Add(luarocks
PREFIX ${DEPS_BUILD_DIR}
URL ${LUAROCKS_URL}
@@ -21,7 +21,9 @@ ExternalProject_Add(luarocks
--lua-suffix=jit
BUILD_COMMAND ""
INSTALL_COMMAND ${MAKE_PRG} bootstrap)
+
list(APPEND THIRD_PARTY_DEPS luarocks)
+
if(USE_BUNDLED_LUAJIT)
add_dependencies(luarocks luajit)
endif()
@@ -82,5 +84,3 @@ add_custom_target(nvim-client
DEPENDS ${DEPS_LIB_DIR}/luarocks/rocks/nvim-client)
list(APPEND THIRD_PARTY_DEPS stable-busted-deps busted lua-messagepack lpeg nvim-client)
-
-