aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThiago de Arruda <tpadilha84@gmail.com>2014-04-13 07:18:12 -0300
committerThiago de Arruda <tpadilha84@gmail.com>2014-04-13 07:32:52 -0300
commit4fb45579b5110add5bdeab930d19d8b1cadd1490 (patch)
tree678c9f051cf108c799891a0077134ed58ec7d453
parent15f3bae801aa979981d86aa072f6a35a88a4f21a (diff)
downloadrneovim-4fb45579b5110add5bdeab930d19d8b1cadd1490.tar.gz
rneovim-4fb45579b5110add5bdeab930d19d8b1cadd1490.tar.bz2
rneovim-4fb45579b5110add5bdeab930d19d8b1cadd1490.zip
Add lpeg as explicit third-party dependency
It was being installed because of moonscript, but now it's listed as a dependency explicitly.
-rw-r--r--third-party/CMakeLists.txt11
1 files changed, 10 insertions, 1 deletions
diff --git a/third-party/CMakeLists.txt b/third-party/CMakeLists.txt
index 1dd468a995..3714de660a 100644
--- a/third-party/CMakeLists.txt
+++ b/third-party/CMakeLists.txt
@@ -172,7 +172,16 @@ if(USE_BUNDLED_LUAROCKS)
add_custom_target(lua-cmsgpack
DEPENDS ${DEPS_LIB_DIR}/luarocks/rocks/lua-cmsgpack)
- list(APPEND THIRD_PARTY_DEPS moonscript busted lua-cmsgpack)
+ # lpeg is a moonscript dependency, but since it is also required for
+ # normal compilation(even without unit testing) we better add it explicitly.
+ # Like before, depend on cmsgpack to ensure serialization of install commands
+ add_custom_command(OUTPUT ${DEPS_LIB_DIR}/luarocks/rocks/lpeg
+ COMMAND ${DEPS_BIN_DIR}/luarocks ARGS install lpeg
+ DEPENDS lua-cmsgpack)
+ add_custom_target(lpeg
+ DEPENDS ${DEPS_LIB_DIR}/luarocks/rocks/lpeg)
+
+ list(APPEND THIRD_PARTY_DEPS moonscript busted lua-cmsgpack lpeg)
endif()
add_custom_target(third-party ALL