From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Fri, 15 Nov 2019 11:58:43 +0000 (+0000)
Subject: [Rework] Move cmake modules to a dedicated path
X-Git-Tag: 2.2~38
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c15ca59b25403a3d6a3d9383f2dabf4b8d419876;p=thirdparty%2Frspamd.git

[Rework] Move cmake modules to a dedicated path
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c6b446cac9..58d0daa87d 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
similarity index 100%
rename from src/libcryptobox/AsmOp.cmake
rename to cmake/AsmOp.cmake
diff --git a/FindArch.cmake b/cmake/FindArch.cmake
similarity index 100%
rename from FindArch.cmake
rename to cmake/FindArch.cmake
diff --git a/FindRagel.cmake b/cmake/FindRagel.cmake
similarity index 100%
rename from FindRagel.cmake
rename to cmake/FindRagel.cmake
diff --git a/PVS-Studio.cmake b/cmake/PVS-Studio.cmake
similarity index 100%
rename from PVS-Studio.cmake
rename to cmake/PVS-Studio.cmake
diff --git a/src/libcryptobox/CMakeLists.txt b/src/libcryptobox/CMakeLists.txt
index 8ab390fa12..beeeb1eec0 100644
--- a/src/libcryptobox/CMakeLists.txt
+++ b/src/libcryptobox/CMakeLists.txt
@@ -1,4 +1,4 @@
-INCLUDE(AsmOp.cmake)
+INCLUDE(AsmOp)
 
 TARGET_ARCHITECTURE(ARCH)