diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2019-11-15 11:58:43 +0000 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2019-11-15 11:58:43 +0000 |
| commit | c15ca59b25403a3d6a3d9383f2dabf4b8d419876 (patch) | |
| tree | d39c367b205dfb9c033ba4692c9af2a790db587c | |
| parent | 526c3aedfcc17353fab76dfd3a4f393264b3bc2f (diff) | |
| download | rspamd-c15ca59b25403a3d6a3d9383f2dabf4b8d419876.tar.gz rspamd-c15ca59b25403a3d6a3d9383f2dabf4b8d419876.zip | |
[Rework] Move cmake modules to a dedicated path
| -rw-r--r-- | CMakeLists.txt | 7 | ||||
| -rw-r--r-- | cmake/AsmOp.cmake (renamed from src/libcryptobox/AsmOp.cmake) | 0 | ||||
| -rw-r--r-- | cmake/FindArch.cmake (renamed from FindArch.cmake) | 0 | ||||
| -rw-r--r-- | cmake/FindRagel.cmake (renamed from FindRagel.cmake) | 0 | ||||
| -rw-r--r-- | cmake/PVS-Studio.cmake (renamed from PVS-Studio.cmake) | 0 | ||||
| -rw-r--r-- | src/libcryptobox/CMakeLists.txt | 2 |
6 files changed, 5 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c6b446cac..58d0daa87 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,6 +26,7 @@ PROJECT(rspamd VERSION "${RSPAMD_VERSION}" LANGUAGES C ASM) # This is supported merely with cmake 3.1 SET(CMAKE_C_STANDARD 11) SET(CMAKE_C_STANDARD_REQUIRED ON) +LIST(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/") SET(RSPAMD_MASTER_SITE_URL "https://rspamd.com") @@ -64,10 +65,10 @@ OPTION(ENABLE_LUA_REPL "Enables Lua repl (requires C++11 compiler) [default: OPTION(ENABLE_BLAS "Enables libopenblas support [default: OFF]" OFF) -INCLUDE(FindArch.cmake) +INCLUDE(FindArch) TARGET_ARCHITECTURE(ARCH) -INCLUDE(FindRagel.cmake) +INCLUDE(FindRagel) IF(NOT RAGEL_FOUND) MESSAGE(FATAL_ERROR "Ragel is required to build rspamd") ENDIF() @@ -1357,7 +1358,7 @@ ENDIF(NOT DEBIAN_BUILD) find_program(_PVS_STUDIO "pvs-studio-analyzer") if(_PVS_STUDIO) - include(${CMAKE_SOURCE_DIR}/PVS-Studio.cmake) + include(PVS-Studio) pvs_studio_add_target(TARGET ${PROJECT_NAME}.analyze ANALYZE ${PROJECT_NAME} rspamd-server rspamadm rspamc OUTPUT FORMAT errorfile diff --git a/src/libcryptobox/AsmOp.cmake b/cmake/AsmOp.cmake index bcf9d996a..bcf9d996a 100644 --- a/src/libcryptobox/AsmOp.cmake +++ b/cmake/AsmOp.cmake diff --git a/FindArch.cmake b/cmake/FindArch.cmake index 277289248..277289248 100644 --- a/FindArch.cmake +++ b/cmake/FindArch.cmake diff --git a/FindRagel.cmake b/cmake/FindRagel.cmake index a058b7fb1..a058b7fb1 100644 --- a/FindRagel.cmake +++ b/cmake/FindRagel.cmake diff --git a/PVS-Studio.cmake b/cmake/PVS-Studio.cmake index 6001f3337..6001f3337 100644 --- a/PVS-Studio.cmake +++ b/cmake/PVS-Studio.cmake diff --git a/src/libcryptobox/CMakeLists.txt b/src/libcryptobox/CMakeLists.txt index 8ab390fa1..beeeb1eec 100644 --- a/src/libcryptobox/CMakeLists.txt +++ b/src/libcryptobox/CMakeLists.txt @@ -1,4 +1,4 @@ -INCLUDE(AsmOp.cmake) +INCLUDE(AsmOp) TARGET_ARCHITECTURE(ARCH) |