diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2021-05-28 11:52:49 +0100 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2021-05-28 11:52:49 +0100 |
| commit | ab8882972d32c737afeda1902f96879f75f0a512 (patch) | |
| tree | 59f0bf58e6d1b706ea38c7ad95be3b404def30f9 /src | |
| parent | 339e2ffd33d6953cacfb3bbb35586defb21fa82d (diff) | |
| download | rspamd-ab8882972d32c737afeda1902f96879f75f0a512.tar.gz rspamd-ab8882972d32c737afeda1902f96879f75f0a512.zip | |
[Minor] Always use c++ linker now
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | src/client/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/rspamadm/CMakeLists.txt | 5 |
3 files changed, 4 insertions, 13 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 903aa3159..77c8756af 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -230,12 +230,8 @@ 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() +SET_TARGET_PROPERTIES(rspamd PROPERTIES LINKER_LANGUAGE CXX) +SET_TARGET_PROPERTIES(rspamd-server PROPERTIES LINKER_LANGUAGE CXX) IF(NOT DEBIAN_BUILD) SET_TARGET_PROPERTIES(rspamd PROPERTIES VERSION ${RSPAMD_VERSION}) ENDIF(NOT DEBIAN_BUILD) diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt index 4e1225ae3..60e422dbd 100644 --- a/src/client/CMakeLists.txt +++ b/src/client/CMakeLists.txt @@ -7,9 +7,7 @@ SET(RSPAMCSRC rspamc.c) ADD_EXECUTABLE(rspamc ${RSPAMCSRC} ${LIBRSPAMDCLIENTSRC}) SET_TARGET_PROPERTIES(rspamc PROPERTIES COMPILE_FLAGS "-I${CMAKE_SOURCE_DIR}/lib") TARGET_LINK_LIBRARIES(rspamc rspamd-server) -IF(USE_CXX_LINKER) - SET_TARGET_PROPERTIES(rspamc PROPERTIES LINKER_LANGUAGE CXX) -ENDIF() +SET_TARGET_PROPERTIES(rspamc PROPERTIES LINKER_LANGUAGE CXX) IF(NOT DEBIAN_BUILD) SET_TARGET_PROPERTIES(rspamc PROPERTIES VERSION ${RSPAMD_VERSION}) diff --git a/src/rspamadm/CMakeLists.txt b/src/rspamadm/CMakeLists.txt index 51ce1bc1b..13e2fb6da 100644 --- a/src/rspamadm/CMakeLists.txt +++ b/src/rspamadm/CMakeLists.txt @@ -27,8 +27,5 @@ IF (NOT DEBIAN_BUILD) SET_TARGET_PROPERTIES(rspamadm PROPERTIES VERSION ${RSPAMD_VERSION}) ENDIF (NOT DEBIAN_BUILD) -IF(USE_CXX_LINKER) - SET_TARGET_PROPERTIES(rspamadm PROPERTIES LINKER_LANGUAGE CXX) -ENDIF() - +SET_TARGET_PROPERTIES(rspamadm PROPERTIES LINKER_LANGUAGE CXX) INSTALL(TARGETS rspamadm RUNTIME DESTINATION bin) |