Browse Source

Merge.

tags/0.6.6
Vsevolod Stakhov 10 years ago
parent
commit
263a564e0b
2 changed files with 1 additions and 6 deletions
  1. 0
    2
      .hgtags
  2. 1
    4
      CMakeLists.txt

+ 0
- 2
.hgtags View File

@@ -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

+ 1
- 4
CMakeLists.txt View File

@@ -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)

Loading…
Cancel
Save