diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2015-04-28 17:01:00 +0100 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2015-04-28 17:01:00 +0100 |
| commit | 7f8ab548d375051edb54fed9bafd8996f2f3fb33 (patch) | |
| tree | 6e18ce4c9f1125e395470a9d6573f221a37795a3 | |
| parent | faf96d9f2a7ab25de198b1fa555b2985237de2c0 (diff) | |
| download | rspamd-7f8ab548d375051edb54fed9bafd8996f2f3fb33.tar.gz rspamd-7f8ab548d375051edb54fed9bafd8996f2f3fb33.zip | |
Another round of linking issues fixup.
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | contrib/aho-corasick/CMakeLists.txt | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 7c54841a7..678d110ac 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -93,7 +93,7 @@ ENDIF(NOT WWWDIR) IF(NOT LIBDIR) SET(RSPAMD_LIBDIR "${CMAKE_INSTALL_PREFIX}/lib/rspamd") ELSE(NOT LIBDIR) - SET(RSPAMD_LIBDIR "${LIBDIR}/rspamd") + SET(RSPAMD_LIBDIR "${LIBDIR}") ENDIF(NOT LIBDIR) SET(CMAKE_MACOSX_RPATH ON) SET(CMAKE_INSTALL_RPATH "${RSPAMD_LIBDIR}") @@ -406,7 +406,7 @@ IF(CMAKE_SYSTEM_NAME STREQUAL "SunOS") LIST(APPEND CMAKE_REQUIRED_LIBRARIES crypto) SET(CMAKE_VERBOSE_MAKEFILE ON) SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE) - SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib:${CMAKE_INSTALL_PREFIX}/${LIBDIR}:${RSPAMD_LIBDIR}") + SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib:${RSPAMD_LIBDIR}") ENDIF(CMAKE_SYSTEM_NAME STREQUAL "SunOS") # Now find libraries and headers diff --git a/contrib/aho-corasick/CMakeLists.txt b/contrib/aho-corasick/CMakeLists.txt index d185245cb..7209c5094 100644 --- a/contrib/aho-corasick/CMakeLists.txt +++ b/contrib/aho-corasick/CMakeLists.txt @@ -4,5 +4,6 @@ if ("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_C_COMPILER_ID}" STREQU SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3") endif () ADD_LIBRARY(rspamd-actrie SHARED ${AHOCORASICSRC}) +TARGET_LINK_LIBRARIES(rspamd-actrie ${RSPAMD_REQUIRED_LIBRARIES}) INSTALL(TARGETS rspamd-actrie LIBRARY DESTINATION ${RSPAMD_LIBDIR}) |