From bf9d32c2e37bdb0a081948c564ea48eebc148a0c Mon Sep 17 00:00:00 2001 From: Vsevolod Stakhov Date: Sat, 26 Oct 2013 14:13:28 +0100 Subject: [PATCH] Remove unused code from the build. --- lib/CMakeLists.txt | 39 ++++++--------------------------------- 1 file changed, 6 insertions(+), 33 deletions(-) diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 9f4636dd7..520acece4 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -137,12 +137,12 @@ ENDIF(NOT DEBIAN_BUILD) # Librspamd-server -IF(WITH_DB) - LIST(APPEND LIBRSPAMDSERVERSRC ../src/kvstorage_bdb.c) -ENDIF(WITH_DB) -IF(WITH_SQLITE) - LIST(APPEND LIBRSPAMDSERVERSRC ../src/kvstorage_sqlite.c) -ENDIF(WITH_SQLITE) +#IF(WITH_DB) +# LIST(APPEND LIBRSPAMDSERVERSRC ../src/kvstorage_bdb.c) +#ENDIF(WITH_DB) +#IF(WITH_SQLITE) +# LIST(APPEND LIBRSPAMDSERVERSRC ../src/kvstorage_sqlite.c) +#ENDIF(WITH_SQLITE) ADD_LIBRARY(rspamd-server ${LINK_TYPE} ${LIBRSPAMDSERVERSRC} ${TOKENIZERSSRC} ${CLASSIFIERSSRC}) IF(NOT DEBIAN_BUILD) @@ -202,31 +202,4 @@ IF(NO_SHARED MATCHES "OFF") PUBLIC_HEADER DESTINATION ${INCLUDEDIR}) ENDIF(NO_SHARED MATCHES "OFF") -# Libkvstorageclient -IF(NOT DEBIAN_BUILD) - ADD_LIBRARY(kvstorageclient SHARED ${LIBRKVSTORAGESRC}) - ADD_LIBRARY(kvstorageclient_static STATIC ${LIBRKVSTORAGESRC}) - IF(NOT DEBIAN_BUILD) - SET_TARGET_PROPERTIES(kvstorageclient PROPERTIES PUBLIC_HEADER "kvstorage/libkvstorageclient.h") - ENDIF(NOT DEBIAN_BUILD) - - IF(CMAKE_COMPILER_IS_GNUCC) - SET_TARGET_PROPERTIES(kvstorageclient PROPERTIES COMPILE_FLAGS "-fno-strict-aliasing") - SET_TARGET_PROPERTIES(kvstorageclient_static PROPERTIES COMPILE_FLAGS "-fno-strict-aliasing") - ENDIF(CMAKE_COMPILER_IS_GNUCC) - - TARGET_LINK_LIBRARIES(kvstorageclient rspamd-util) - - TARGET_LINK_LIBRARIES(kvstorageclient_static ${CMAKE_REQUIRED_LIBRARIES}) - TARGET_LINK_LIBRARIES(kvstorageclient_static ${GLIB2_LIBRARIES}) - - SET_TARGET_PROPERTIES(kvstorageclient PROPERTIES VERSION ${RSPAMD_VERSION}) - SET_TARGET_PROPERTIES(kvstorageclient_static PROPERTIES VERSION ${RSPAMD_VERSION}) - - - IF(GLIB_COMPAT) - INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/contrib/lgpl") - TARGET_LINK_LIBRARIES(kvstorageclient glibadditions) - ENDIF(GLIB_COMPAT) -ENDIF(NOT DEBIAN_BUILD) INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/src") \ No newline at end of file -- 2.39.5