From fc95ba48638d25b92de04a756ebf2cc22bcd3260 Mon Sep 17 00:00:00 2001 From: Vsevolod Stakhov Date: Mon, 27 Apr 2015 10:31:25 +0100 Subject: [PATCH] Fix some contrib libraries. --- contrib/cdb/CMakeLists.txt | 9 ++------- contrib/http-parser/CMakeLists.txt | 11 +++-------- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/contrib/cdb/CMakeLists.txt b/contrib/cdb/CMakeLists.txt index 7f3850bc56..6b5b676dc8 100644 --- a/contrib/cdb/CMakeLists.txt +++ b/contrib/cdb/CMakeLists.txt @@ -3,11 +3,6 @@ SET(CDBSRC cdb_init.c cdb_find.c cdb_make.c) -ADD_LIBRARY(rspamd-cdb ${LINK_TYPE} ${CDBSRC}) +ADD_LIBRARY(rspamd-cdb STATIC ${CDBSRC}) SET_TARGET_PROPERTIES(rspamd-cdb PROPERTIES VERSION ${RSPAMD_VERSION}) -SET_TARGET_PROPERTIES(rspamd-cdb PROPERTIES COMPILE_FLAGS "-DRSPAMD_LIB") -IF(NO_SHARED MATCHES "OFF") - INSTALL(TARGETS rspamd-cdb - LIBRARY DESTINATION ${LIBDIR} - PUBLIC_HEADER DESTINATION ${INCLUDEDIR}) -ENDIF(NO_SHARED MATCHES "OFF") \ No newline at end of file +SET_TARGET_PROPERTIES(rspamd-cdb PROPERTIES COMPILE_FLAGS "-DRSPAMD_LIB") \ No newline at end of file diff --git a/contrib/http-parser/CMakeLists.txt b/contrib/http-parser/CMakeLists.txt index 40b0d55c9d..ac870d9c43 100644 --- a/contrib/http-parser/CMakeLists.txt +++ b/contrib/http-parser/CMakeLists.txt @@ -3,12 +3,7 @@ SET(HTTPSRC http_parser.c) if ("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "GNU") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3") endif () -ADD_LIBRARY(rspamd-http-parser ${LINK_TYPE} ${HTTPSRC}) -SET_TARGET_PROPERTIES(rspamd-http-parser PROPERTIES VERSION ${RSPAMD_VERSION}) -SET_TARGET_PROPERTIES(rspamd-http-parser PROPERTIES COMPILE_FLAGS "-DRSPAMD_LIB") -IF(NO_SHARED MATCHES "OFF") - INSTALL(TARGETS rspamd-http-parser - LIBRARY DESTINATION ${LIBDIR} - PUBLIC_HEADER DESTINATION ${INCLUDEDIR}) -ENDIF(NO_SHARED MATCHES "OFF") \ No newline at end of file +ADD_LIBRARY(rspamd-http-parser STATIC ${HTTPSRC}) +SET_TARGET_PROPERTIES(rspamd-http-parser PROPERTIES VERSION ${RSPAMD_VERSION}) +SET_TARGET_PROPERTIES(rspamd-http-parser PROPERTIES COMPILE_FLAGS "-DRSPAMD_LIB") \ No newline at end of file -- 2.47.3