diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2013-12-23 15:10:54 +0000 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2013-12-23 15:10:54 +0000 |
| commit | 263a564e0b00510a9fc5962f1c9c310ab1816057 (patch) | |
| tree | 753e19be44c416e5e0fb9272585054c7ac385fd1 | |
| parent | 3c636ddfbd6c7f043448a652c2cbb98a12391641 (diff) | |
| parent | 206c3b4c8ea10cd2a76982f05ff625c354a3c7aa (diff) | |
| download | rspamd-263a564e0b00510a9fc5962f1c9c310ab1816057.tar.gz rspamd-263a564e0b00510a9fc5962f1c9c310ab1816057.zip | |
Merge.
| -rw-r--r-- | .hgtags | 2 | ||||
| -rw-r--r-- | CMakeLists.txt | 5 |
2 files changed, 1 insertions, 6 deletions
@@ -46,8 +46,6 @@ bf9307c5d78bd9b06e9fcae008db959aad1e62d2 0.5.4 e11d0fa6d58038a59ed5ed5cba04ec2b1089d61b 0.6.0 fd359d2ef59b1c0e35ca6c1db7f0b4cb5cf7e9fd 0.6.1 e34a90b92b248cca1b8cb03052084e5e441ec21d 0.6.2 -749f70baf96e5a600c9d302bba3161a61323bb40 0.6.3 -749f70baf96e5a600c9d302bba3161a61323bb40 0.6.3 28685d33512977c42fdfb3000ee05a28f6097794 0.6.3 7efe36ce9272d6c6c521041ec8c587ee79f7ba7e 0.6.4 7efe36ce9272d6c6c521041ec8c587ee79f7ba7e 0.6.4 diff --git a/CMakeLists.txt b/CMakeLists.txt index 66fcc9430..4260e82df 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -927,9 +927,6 @@ IF(NOT HAVE_COMPATIBLE_QUEUE_H) INCLUDE_DIRECTORIES(compat) ENDIF(NOT HAVE_COMPATIBLE_QUEUE_H) - -SET(CONTRIBSRC "") - IF(NOT DESTDIR) SET(DESTDIR $ENV{DESTDIR}) ENDIF(NOT DESTDIR) @@ -1041,7 +1038,7 @@ SET(CONFFILES ######################### LINK SECTION ############################### -ADD_EXECUTABLE(rspamd ${RSPAMDSRC} ${CONTRIBSRC} ${PLUGINSSRC}) +ADD_EXECUTABLE(rspamd ${RSPAMDSRC} ${PLUGINSSRC}) SET_TARGET_PROPERTIES(rspamd PROPERTIES LINKER_LANGUAGE C) SET_TARGET_PROPERTIES(rspamd PROPERTIES COMPILE_FLAGS "-DRSPAMD_MAIN") IF(NOT DEBIAN_BUILD) |