diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2015-09-29 13:32:47 +0100 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2015-09-29 13:32:47 +0100 |
| commit | 668ed90e8d01d23825084f02547b24663c6af013 (patch) | |
| tree | 41e83ac13512b1bd7a0e6c0d82dab1e2692da91d | |
| parent | c171c618363d848cf764cf6df1ec7f5efd48bf82 (diff) | |
| download | rspamd-668ed90e8d01d23825084f02547b24663c6af013.tar.gz rspamd-668ed90e8d01d23825084f02547b24663c6af013.zip | |
Try to avoid collision with locally installed includes.
| -rw-r--r-- | CMakeLists.txt | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index efe671b64..aba09f668 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -403,7 +403,25 @@ ENDMACRO() ############################# CONFIG SECTION ############################################# # Initial set -INCLUDE_DIRECTORIES(src/libutil src/libserver src/libmime src/libstat src/libcryptobox) +# Prefer local include dirs to system ones +INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/src" + "${CMAKE_SOURCE_DIR}/src/libutil" + "${CMAKE_SOURCE_DIR}/src/libserver" + "${CMAKE_SOURCE_DIR}/src/libmime" + "${CMAKE_SOURCE_DIR}/src/libstat" + "${CMAKE_SOURCE_DIR}/src/libcryptobox" + "${CMAKE_SOURCE_DIR}/contrib/libucl" + "${CMAKE_SOURCE_DIR}/contrib/uthash" + "${CMAKE_SOURCE_DIR}/contrib/http-parser" + "${CMAKE_SOURCE_DIR}/contrib/libottery" + "${CMAKE_SOURCE_DIR}/contrib/xxhash" + "${CMAKE_SOURCE_DIR}/contrib/cdb" + "${CMAKE_SOURCE_DIR}/contrib/snowball/include" + "${CMAKE_SOURCE_DIR}/contrib/blake2" + "${CMAKE_SOURCE_DIR}/contrib/librdns" + "${CMAKE_SOURCE_DIR}/contrib/aho-corasick" + "${CMAKE_BINARY_DIR}/src" #Stored in the binary dir + "${CMAKE_BINARY_DIR}/src/libcryptobox") IF(CMAKE_INSTALL_PREFIX) SET(PREFIX ${CMAKE_INSTALL_PREFIX}) @@ -946,22 +964,7 @@ ELSE(HG) ENDIF(HG_ID) ENDIF(HG_ARCH) ENDIF(HG) - -################################ SOURCES SECTION ########################### -INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/src" - "${CMAKE_BINARY_DIR}/src" - "${CMAKE_BINARY_DIR}/src/libcryptobox" - "${CMAKE_SOURCE_DIR}/contrib/libucl" - "${CMAKE_SOURCE_DIR}/contrib/uthash" - "${CMAKE_SOURCE_DIR}/contrib/http-parser" - "${CMAKE_SOURCE_DIR}/contrib/libottery" - "${CMAKE_SOURCE_DIR}/contrib/xxhash" - "${CMAKE_SOURCE_DIR}/contrib/cdb" - "${CMAKE_SOURCE_DIR}/contrib/snowball/include" - "${CMAKE_SOURCE_DIR}/contrib/blake2" - "${CMAKE_SOURCE_DIR}/contrib/librdns" - "${CMAKE_SOURCE_DIR}/contrib/aho-corasick") ################################ SUBDIRS SECTION ########################### |