Another fix for out-source build.

Unbreak FreeBSD build.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3ccd9d90a69ea72f5c2927d45f731157014ca2de..6bfc718b2ce3fa8638587dc5a68954bdaa2e76c0 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -218,7 +218,6 @@ ENDIF(PCRE_INCLUDE_DIRS)
 IF(PCRE_LIBRARY_DIRS)
        LINK_DIRECTORIES("${PCRE_LIBRARY_DIRS}")
 ENDIF(PCRE_LIBRARY_DIRS)
-LIST(APPEND CMAKE_REQUIRED_LIBRARIES "pcre")
 
 IF(ENABLE_STATIC MATCHES "ON")
        pkg_check_modules(GLIB2 REQUIRED glib-2.0>=2.12)
@@ -647,6 +646,7 @@ IF(LIBJUDY_LIBRARY)
        TARGET_LINK_LIBRARIES(rspamd Judy)
 ENDIF(LIBJUDY_LIBRARY)
 TARGET_LINK_LIBRARIES(rspamd event)
+TARGET_LINK_LIBRARIES(rspamd pcre)
 
 TARGET_LINK_LIBRARIES(rspamd ${CMAKE_REQUIRED_LIBRARIES})
 TARGET_LINK_LIBRARIES(rspamd ${GLIB2_LIBRARIES})

diff --git a/contrib/lgpl/CMakeLists.txt b/contrib/lgpl/CMakeLists.txt
index 0973e22435342d632c9f7b20e6b0cc5dbe667abf..56cedff89318cce0ad37591def059bc3819536fa 100644 (file)
--- a/contrib/lgpl/CMakeLists.txt
+++ b/contrib/lgpl/CMakeLists.txt
@@ -14,6 +14,7 @@ IF(GLIB2_VERSION VERSION_LESS "2.16")
        
        TARGET_LINK_LIBRARIES(glibadditions ${CMAKE_REQUIRED_LIBRARIES})
        TARGET_LINK_LIBRARIES(glibadditions ${GLIB2_LIBRARIES})
+       TARGET_LINK_LIBRARIES(glibadditions pcre)
 
        SET_TARGET_PROPERTIES(glibadditions PROPERTIES VERSION ${RSPAMD_VERSION})
 

diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 655e023031f5621f543451c73b5ee0a72ef971e2..6071c0e7856c479ccf04083130058358d360c3b4 100644 (file)
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -8,6 +8,7 @@ SET_TARGET_PROPERTIES(rspamdclient PROPERTIES PUBLIC_HEADER "librspamdclient.h")
 SET_TARGET_PROPERTIES(rspamdclient_static PROPERTIES COMPILE_FLAGS "-fno-strict-aliasing")
 
 TARGET_LINK_LIBRARIES(rspamdclient ${CMAKE_REQUIRED_LIBRARIES})
+TARGET_LINK_LIBRARIES(rspamdclient pcre)
 TARGET_LINK_LIBRARIES(rspamdclient ${GLIB2_LIBRARIES})
 
 TARGET_LINK_LIBRARIES(rspamdclient_static ${CMAKE_REQUIRED_LIBRARIES})
@@ -70,4 +71,4 @@ 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)   

diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt
index 1f2a50b09c67c3fdba913beb3f24fe1e6aeb8b37..37ca91043f00dd376dc5f8e5cc5dc4807e813b89 100644 (file)
--- a/src/client/CMakeLists.txt
+++ b/src/client/CMakeLists.txt
@@ -5,6 +5,7 @@ ADD_EXECUTABLE(rspamc ${RSPAMCSRC})
 SET_TARGET_PROPERTIES(rspamc PROPERTIES COMPILE_FLAGS "-I${CMAKE_SOURCE_DIR}/lib")
 TARGET_LINK_LIBRARIES(rspamc rspamdserver)
 TARGET_LINK_LIBRARIES(rspamc rspamdclient)
+TARGET_LINK_LIBRARIES(rspamc pcre)
 TARGET_LINK_LIBRARIES(rspamc ${CMAKE_REQUIRED_LIBRARIES})
 TARGET_LINK_LIBRARIES(rspamc ${GLIB2_LIBRARIES})
 SET_TARGET_PROPERTIES(rspamc PROPERTIES VERSION ${RSPAMD_VERSION})

diff --git a/src/json/hashtable.c b/src/json/hashtable.c
index 14a59aff19fcd7fe9d750e0d993c24c5d2fce22c..92d83eea1228bef67b38c89b0aa9217ba9de3b09 100644 (file)
--- a/src/json/hashtable.c
+++ b/src/json/hashtable.c
@@ -5,7 +5,7 @@
  * it under the terms of the MIT license. See LICENSE for details.
  */
 
-#include "../config.h"
+#include "config.h"
 #include "hashtable.h"
 
 typedef struct hashtable_list   list_t;

diff --git a/src/json/hashtable.h b/src/json/hashtable.h
index 30e52daa81e7b6f6b56f5eb2f0a2a22c1ff5c6b4..35196b0c08aeb26e8521af178333f23f8212edcb 100644 (file)
--- a/src/json/hashtable.h
+++ b/src/json/hashtable.h
@@ -8,7 +8,7 @@
 #ifndef HASHTABLE_H
 #define HASHTABLE_H
 
-#include "../config.h"
+#include "config.h"
 
 typedef unsigned int (*key_hash_fn)(const void *key);
 typedef int (*key_cmp_fn)(const void *key1, const void *key2);

diff --git a/src/json/strbuffer.c b/src/json/strbuffer.c
index b6afcc2482bae1966bbf59dfddfbefbc9d742549..1ae336d3d2d25a5d1e10eb959ea9ffc288583c54 100644 (file)
--- a/src/json/strbuffer.c
+++ b/src/json/strbuffer.c
@@ -5,7 +5,7 @@
  * it under the terms of the MIT license. See LICENSE for details.
  */
 
-#include "../config.h"
+#include "config.h"
 #include "strbuffer.h"
 #include "util.h"
 

diff --git a/src/json/utf.c b/src/json/utf.c
index b026308126e655aa860efefbfa9a2a5262e07f46..7635bef8a3fcd261e9b4dec656e68d0d623ffc21 100644 (file)
--- a/src/json/utf.c
+++ b/src/json/utf.c
@@ -5,7 +5,7 @@
  * it under the terms of the MIT license. See LICENSE for details.
  */
 
-#include "../config.h"
+#include "config.h"
 
 int
 utf8_encode (int codepoint, char *buffer, int *size)