From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Tue, 14 Jun 2016 19:55:39 +0000 (+0100)
Subject: [Fix] Fix build
X-Git-Tag: 1.3.0~338
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=1de3b213131faf3e4cf4864f93e52739f4865e13;p=rspamd.git

[Fix] Fix build
---

diff --git a/.travis.yml b/.travis.yml
index cf1a0b50f..d2c8bf754 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,7 @@ language: c
 
 before_script:
   - sudo apt-get update -qq
-  - sudo apt-get install -qq cmake libevent-dev libglib2.0-dev libgmime-2.6-dev libluajit-5.1-dev liblua5.1-0-dev libpcre3-dev libsqlite3-dev libmagic-dev
+  - sudo apt-get install -qq cmake libevent-dev libglib2.0-dev libgmime-2.6-dev libluajit-5.1-dev liblua5.1-0-dev libpcre3-dev libsqlite3-dev libmagic-dev ragel make libssl-dev
 #  - echo $TRAVIS_OS_NAME
 #  - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get update -qq ; fi
 #  - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get install -qq cmake libevent-dev libglib2.0-dev libgmime-2.6-dev libluajit-5.1-dev libpcre3-dev libsqlite3-dev libhiredis-dev ; fi
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d4765ce79..b9accae30 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -117,9 +117,15 @@ RAGEL_TARGET(ragel_smtp_received
 	OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/smtp_received_parser.rl.c)
 ######################### LINK SECTION ###############################
 
-ADD_LIBRARY(rspamd-server STATIC ${RSPAMD_CRYPTOBOX} ${RSPAMD_UTIL} ${RSPAMD_LUA} ${RSPAMD_SERVER}
-		${RSPAMD_STAT} ${RSPAMD_MIME}
-		${CMAKE_CURRENT_BINARY_DIR}/modules.c ${PLUGINSSRC}
+ADD_LIBRARY(rspamd-server STATIC
+		${RSPAMD_CRYPTOBOX}
+		${RSPAMD_UTIL}
+		${RSPAMD_LUA}
+		${RSPAMD_SERVER}
+		${RSPAMD_STAT}
+		${RSPAMD_MIME}
+		${CMAKE_CURRENT_BINARY_DIR}/modules.c
+		${PLUGINSSRC}
 		"${RAGEL_ragel_smtp_addr_OUTPUTS}"
 		"${RAGEL_ragel_smtp_received_OUTPUTS}")
 TARGET_LINK_LIBRARIES(rspamd-server rspamd-http-parser)
@@ -130,6 +136,7 @@ TARGET_LINK_LIBRARIES(rspamd-server lcbtrie)
 IF (ENABLE_CLANG_PLUGIN MATCHES "ON")
 	ADD_DEPENDENCIES(rspamd-server rspamd-clang)
 ENDIF()
+ADD_DEPENDENCIES(rspamd-server rspamd_lua_preprocess)
 
 ADD_EXECUTABLE(rspamd ${RSPAMDSRC} ${CMAKE_CURRENT_BINARY_DIR}/workers.c)
 SET_TARGET_PROPERTIES(rspamd PROPERTIES LINKER_LANGUAGE C)