From 4fb45579b5110add5bdeab930d19d8b1cadd1490 Mon Sep 17 00:00:00 2001 From: Thiago de Arruda Date: Sun, 13 Apr 2014 07:18:12 -0300 Subject: Add lpeg as explicit third-party dependency It was being installed because of moonscript, but now it's listed as a dependency explicitly. --- third-party/CMakeLists.txt | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) 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 -- cgit