commit 5f2aad3: [Minor] Fix linking

Vsevolod Stakhov vsevolod at highsecure.ru
Thu Feb 14 17:35:05 UTC 2019


Author: Vsevolod Stakhov
Date: 2019-02-14 17:26:48 +0000
URL: https://github.com/rspamd/rspamd/commit/5f2aad306e13c1688a0e0d48be65aa5bd6070ebb

[Minor] Fix linking

---
 src/CMakeLists.txt | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 27b9277b4..256feb522 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -206,18 +206,15 @@ IF (ENABLE_HYPERSCAN MATCHES "ON")
 ENDIF()
 
 TARGET_LINK_LIBRARIES(rspamd-server rspamd-linenoise)
-
-IF(USE_CXX_LINKER)
-	SET_TARGET_PROPERTIES(rspamd PROPERTIES LINKER_LANGUAGE CXX)
-	SET_TARGET_PROPERTIES(rspamd-server PROPERTIES LINKER_LANGUAGE CXX)
-ENDIF()
-
-
 TARGET_LINK_LIBRARIES(rspamd-server ${RSPAMD_REQUIRED_LIBRARIES})
 
 ADD_EXECUTABLE(rspamd ${RSPAMDSRC} ${CMAKE_CURRENT_BINARY_DIR}/workers.c)
 SET_TARGET_PROPERTIES(rspamd PROPERTIES LINKER_LANGUAGE C)
 SET_TARGET_PROPERTIES(rspamd PROPERTIES COMPILE_FLAGS "-DRSPAMD_MAIN")
+IF(USE_CXX_LINKER)
+	SET_TARGET_PROPERTIES(rspamd PROPERTIES LINKER_LANGUAGE CXX)
+	SET_TARGET_PROPERTIES(rspamd-server PROPERTIES LINKER_LANGUAGE CXX)
+ENDIF()
 IF(NOT DEBIAN_BUILD)
 	SET_TARGET_PROPERTIES(rspamd PROPERTIES VERSION ${RSPAMD_VERSION})
 ENDIF(NOT DEBIAN_BUILD)


More information about the Commits mailing list