]> source.dussan.org Git - rspamd.git/commitdiff
[Minor] Remove CXX linker requirement unless static Hyperscan is linked
authorVsevolod Stakhov <vsevolod@highsecure.ru>
Tue, 9 Jul 2019 11:05:33 +0000 (12:05 +0100)
committerVsevolod Stakhov <vsevolod@highsecure.ru>
Tue, 9 Jul 2019 11:05:33 +0000 (12:05 +0100)
CMakeLists.txt

index 00c34055393ee522c25d42916909ef0255fcc2fb..06cc9fd303d68bad275ddd74094c926e74b4a607 100644 (file)
@@ -21,11 +21,9 @@ ENDIF()
 
 SET(RSPAMD_VERSION         "${RSPAMD_VERSION_MAJOR}.${RSPAMD_VERSION_MINOR}")
 
-PROJECT(rspamd VERSION "${RSPAMD_VERSION}" LANGUAGES C CXX ASM)
+PROJECT(rspamd VERSION "${RSPAMD_VERSION}" LANGUAGES C ASM)
 
 # This is supported merely with cmake 3.1
-SET(USE_CXX_LINKER 1)
-
 SET(CMAKE_C_STANDARD 11)
 SET(CMAKE_C_STANDARD_REQUIRED ON)
 
@@ -652,6 +650,14 @@ IF(ENABLE_HYPERSCAN MATCHES "ON")
                        hs include/hs
                        ROOT ${HYPERSCAN_ROOT_DIR} MODULES libhs)
        SET(WITH_HYPERSCAN 1)
+
+       # For static linking with Hyperscan we need to link using CXX
+       IF (ENABLE_HYPERSCAN MATCHES "ON")
+               IF(${HYPERSCAN_LIBRARY} MATCHES ".*[.]a$" OR STATIC_HYPERSCAN)
+                       ENABLE_LANGUAGE(CXX)
+                       SET(USE_CXX_LINKER 1)
+               ENDIF()
+       ENDIF()
 ENDIF()
 
 #Check for openssl (required for dkim)