diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2018-03-08 13:56:56 +0000 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2018-03-08 13:58:18 +0000 |
| commit | 64aae006eac5d533c1076e62b90c90c61fef72a3 (patch) | |
| tree | 0de9ffb3393c59f689cc95b425feb34335031e11 /CMakeLists.txt | |
| parent | 28f183d2bec2ff85949fd7dbcae1b7dd761fde8c (diff) | |
| download | rspamd-64aae006eac5d533c1076e62b90c90c61fef72a3.tar.gz rspamd-64aae006eac5d533c1076e62b90c90c61fef72a3.zip | |
[Minor] Try to deal with custom include paths better
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 331674723..c8be4e65b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -425,16 +425,19 @@ MACRO(ProcessPackage PKG_NAME) ENDIF(NOT _incl) IF(_incl AND _lib) + # We need to apply heuristic to find the real dir name + STRING(REGEX REPLACE "/[^/]+$" "" _incl_path "${PKG_INCLUDE}") + STRING(REPLACE "${_incl_path}/" "" _stripped_incl "${_incl}") GET_FILENAME_COMPONENT(_lib_path "${_lib}" PATH) - INCLUDE_DIRECTORIES("${_incl}") + INCLUDE_DIRECTORIES("${_stripped_incl}") LINK_DIRECTORIES("${_lib_path}") LIST(APPEND RSPAMD_REQUIRED_LIBRARIES ${_lib}) - SET(${PKG_NAME}_INCLUDE "${_incl}" CACHE INTERNAL "") + SET(${PKG_NAME}_INCLUDE "${_stripped_incl}" CACHE INTERNAL "") SET(${PKG_NAME}_LIBRARY_PATH "${_lib_path}" CACHE INTERNAL "") SET(${PKG_NAME}_LIBRARY "${_lib}" CACHE INTERNAL "") SET(${PKG_NAME}_GUESSED 1 CACHE INTERNAL "") SET(WITH_${PKG_NAME} 1 CACHE INTERNAL "") - MESSAGE(STATUS "Found package ${PKG_NAME} in '${_lib_path}' (${_lib}) and '${_incl}' (${PKG_INCLUDE}).") + MESSAGE(STATUS "Found package ${PKG_NAME} in '${_lib_path}' (${_lib}) and '${_stripped_incl}' (${PKG_INCLUDE}).") ENDIF() ELSE() @@ -646,15 +649,15 @@ ProcessPackage(LIBEVENT LIBRARY event INCLUDE event.h INCLUDE_SUFFIXES include/e ROOT ${LIBEVENT_ROOT_DIR} MODULES event libevent) ProcessPackage(SQLITE3 LIBRARY sqlite3 INCLUDE sqlite3.h INCLUDE_SUFFIXES include/sqlite3 include/sqlite ROOT ${SQLITE3_ROOT_DIR} MODULES sqlite3 sqlite) -ProcessPackage(ICUDATA LIBRARY icudata INCLUDE ucnv.h INCLUDE_SUFFIXES include/unicode +ProcessPackage(ICUDATA LIBRARY icudata INCLUDE unicode/ucnv.h ROOT ${ICU_ROOT_DIR} MODULES icu-i18n) -ProcessPackage(ICUC LIBRARY icuuc INCLUDE ucnv.h INCLUDE_SUFFIXES include/unicode +ProcessPackage(ICUC LIBRARY icuuc INCLUDE unicode/ucnv.h ROOT ${ICU_ROOT_DIR} MODULES icu-i18n) -ProcessPackage(ICUI18N LIBRARY icui18n INCLUDE ucnv.h INCLUDE_SUFFIXES include/unicode +ProcessPackage(ICUI18N LIBRARY icui18n INCLUDE unicode/ucnv.h ROOT ${ICU_ROOT_DIR} MODULES icu-i18n) -ProcessPackage(LIBCRYPT LIBRARY crypto INCLUDE err.h INCLUDE_SUFFIXES include/openssl +ProcessPackage(LIBCRYPT LIBRARY crypto INCLUDE openssl/evp.h ROOT ${OPENSSL_ROOT_DIR} MODULES openssl libcrypt) -ProcessPackage(LIBSSL LIBRARY ssl INCLUDE ssl.h INCLUDE_SUFFIXES include/openssl +ProcessPackage(LIBSSL LIBRARY ssl INCLUDE openssl/ssl.h ROOT ${OPENSSL_ROOT_DIR} MODULES openssl libssl) ProcessPackage(MAGIC LIBRARY magic INCLUDE magic.h INCLUDE_SUFFIXES include/libmagic ROOT ${LIBMAGIC_ROOT_DIR} MODULES magic) |