Fix dependencies in cmake.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bbe628dd53e2f34023884153015a2d2f05098798..cbddacb6fb6843a1fdee4165a5129afd8dd99382 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -563,6 +563,10 @@ SET(PLUGINSSRC     src/plugins/surbl.c
                                src/plugins/fuzzy_check.c
                                src/plugins/spf.c)
 
+ADD_CUSTOM_COMMAND(OUTPUT src/modules.c
+                                       COMMAND ../utils/gen-modules.sh ${PLUGINSSRC}
+                                       WORKING_DIRECTORY src)
+
 ADD_SUBDIRECTORY(src/lua)
 ADD_SUBDIRECTORY(src/json)
 ADD_SUBDIRECTORY(src/cdb)
@@ -578,9 +582,7 @@ LIST(LENGTH PLUGINSSRC RSPAMD_MODULES_NUM)
 
 ############################ TARGETS SECTION ###############################
 
-ADD_CUSTOM_COMMAND(OUTPUT src/modules.c
-                                       COMMAND ../utils/gen-modules.sh ${PLUGINSSRC}
-                                       WORKING_DIRECTORY src)
+
 
 CONFIGURE_FILE(config.h.in src/config.h)
 CONFIGURE_FILE(contrib/exim/local_scan.c.in contrib/exim/local_scan_rspamd.c @ONLY)
@@ -588,7 +590,6 @@ CONFIGURE_FILE(rspamd.xml.sample conf/rspamd.xml.sample @ONLY)
 
 ######################### LINK SECTION ###############################
 
-
 ADD_EXECUTABLE(rspamd ${RSPAMDSRC} ${CONTRIBSRC} ${TOKENIZERSSRC} 
                                          ${CLASSIFIERSSRC} ${PLUGINSSRC})
 SET_TARGET_PROPERTIES(rspamd PROPERTIES LINKER_LANGUAGE C)

diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 951551e62a9bf148697203b20adcd608c151adca..2fdf379047979bcb907e32ea4a8d80f54e1cb08b 100644 (file)
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -64,4 +64,9 @@ SET_TARGET_PROPERTIES(rspamdserver PROPERTIES LINKER_LANGUAGE C)
 SET_TARGET_PROPERTIES(rspamdserver PROPERTIES COMPILE_FLAGS "-DRSPAMD_LIB")
 TARGET_LINK_LIBRARIES(rspamdserver rspamd_lua)
 TARGET_LINK_LIBRARIES(rspamdserver rspamd_json)
-TARGET_LINK_LIBRARIES(rspamdserver rspamd_cdb)          
\ No newline at end of file
+TARGET_LINK_LIBRARIES(rspamdserver rspamd_cdb)   
+
+ADD_CUSTOM_TARGET(genmodules
+                                       COMMAND ../utils/gen-modules.sh ${PLUGINSSRC}
+                                       WORKING_DIRECTORY src)   
+ADD_DEPENDENCIES(rspamdserver genmodules)
\ No newline at end of file

diff --git a/utils/statshow/CMakeLists.txt b/utils/statshow/CMakeLists.txt
index 2e28d019e0c66e39527bf92dc43f843166333db2..bf3308814049252ecbccc94554495e42b5b1adee 100644 (file)
--- a/utils/statshow/CMakeLists.txt
+++ b/utils/statshow/CMakeLists.txt
@@ -2,7 +2,6 @@ SET(STATSHOWSRC statshow.c)
 
 FOREACH(_rs ${CLASSIFIERSSRC} ${TOKENIZERSSRC})
     LIST(APPEND STATSHOWSRC "../../${_rs}")
-    MESSAGE("${_rs}")
 ENDFOREACH(_rs)
 
 ADD_EXECUTABLE(statshow EXCLUDE_FROM_ALL ${STATSHOWSRC})