From: Vsevolod Stakhov Date: Sat, 20 Dec 2014 17:03:30 +0000 (+0000) Subject: Remove checks from debian build. X-Git-Tag: 0.8.0~52 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=e48a8c5e6f966b3395b8ff538990f5a0461c77ed;p=rspamd.git Remove checks from debian build. --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 154e503f2..9e98fb709 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -940,5 +940,7 @@ ADD_CUSTOM_TARGET(dist ${CMAKE_SOURCE_DIR}/dist.sh COMMENT "Create source distribution" WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}) -ADD_CUSTOM_TARGET(check DEPENDS rspamd-test) -ADD_CUSTOM_TARGET(run-test DEPENDS check COMMAND test/rspamd-test) \ No newline at end of file +IF(NOT DEBIAN_BUILD) + ADD_CUSTOM_TARGET(check DEPENDS rspamd-test) + ADD_CUSTOM_TARGET(run-test DEPENDS check COMMAND test/rspamd-test) +ENDIF(NOT DEBIAN_BUILD) \ No newline at end of file diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 4ac7b80a9..63d6ff005 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -16,34 +16,37 @@ ADD_EXECUTABLE(rspamd-test EXCLUDE_FROM_ALL ${TESTSRC}) SET_TARGET_PROPERTIES(rspamd-test PROPERTIES LINKER_LANGUAGE C) SET_TARGET_PROPERTIES(rspamd-test PROPERTIES COMPILE_FLAGS "-DRSPAMD_TEST") -TARGET_LINK_LIBRARIES(rspamd-test event) -TARGET_LINK_LIBRARIES(rspamd-test m) -TARGET_LINK_LIBRARIES(rspamd-test ${GLIB2_LIBRARIES}) -TARGET_LINK_LIBRARIES(rspamd-test ${CMAKE_REQUIRED_LIBRARIES}) TARGET_LINK_LIBRARIES(rspamd-test rspamd-mime) TARGET_LINK_LIBRARIES(rspamd-test rspamd-server) TARGET_LINK_LIBRARIES(rspamd-test rspamd-util) -TARGET_LINK_LIBRARIES(rspamd-test hiredis) +TARGET_LINK_LIBRARIES(rspamd-test rspamd-lua) + +TARGET_LINK_LIBRARIES(rspamd-test event) IF(HAVE_LIBEVENT2) TARGET_LINK_LIBRARIES(rspamd-test event_pthreads) ENDIF(HAVE_LIBEVENT2) -INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/src") -IF(GMIME2_FOUND) - TARGET_LINK_LIBRARIES(rspamd-test ${GMIME2_LIBRARIES}) -ELSE(GMIME2_FOUND) - TARGET_LINK_LIBRARIES(rspamd-test ${GMIME24_LIBRARIES}) -ENDIF(GMIME2_FOUND) -IF(ENABLE_STATIC MATCHES "ON") - TARGET_LINK_LIBRARIES(rspamd-test ${PCRE_LIBRARIES}) -ENDIF(ENABLE_STATIC MATCHES "ON") -IF(ENABLE_LUAJIT MATCHES "ON") - TARGET_LINK_LIBRARIES(rspamd-test "${LUAJIT_LIBRARY}") -ELSE(ENABLE_LUAJIT MATCHES "ON") - TARGET_LINK_LIBRARIES(rspamd-test "${LUA_LIBRARY}") -ENDIF(ENABLE_LUAJIT MATCHES "ON") +IF(WITH_DB) + TARGET_LINK_LIBRARIES(rspamd-test db) +ENDIF(WITH_DB) + IF(OPENSSL_FOUND) TARGET_LINK_LIBRARIES(rspamd-test ${OPENSSL_LIBRARIES}) ENDIF(OPENSSL_FOUND) +IF(HAVE_FETCH_H) + TARGET_LINK_LIBRARIES(rspamd-test fetch) +ENDIF(HAVE_FETCH_H) +TARGET_LINK_LIBRARIES(rspamd-test ${RSPAMD_REQUIRED_LIBRARIES}) + +IF(ENABLE_LUAJIT MATCHES "ON") + TARGET_LINK_LIBRARIES(rspamd-test "${LUAJIT_LIBRARY}") +ELSE(ENABLE_LUAJIT MATCHES "ON") + TARGET_LINK_LIBRARIES(rspamd-test "${LUA_LIBRARY}") +ENDIF(ENABLE_LUAJIT MATCHES "ON") + IF(ENABLE_GPERF_TOOLS MATCHES "ON") TARGET_LINK_LIBRARIES(rspamd-test profiler) -ENDIF(ENABLE_GPERF_TOOLS MATCHES "ON") \ No newline at end of file +ENDIF(ENABLE_GPERF_TOOLS MATCHES "ON") +TARGET_LINK_LIBRARIES(rspamd-test hiredis) +IF(GLIB_COMPAT) + TARGET_LINK_LIBRARIES(rspamd-test glibadditions) +ENDIF(GLIB_COMPAT) \ No newline at end of file