From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Fri, 25 May 2018 11:41:57 +0000 (+0100)
Subject: [Minor] Fix various cmake issues
X-Git-Tag: 1.7.6~102
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=2f08a47d852a3cfb75d27a82d65f7dbf77cbc8bd;p=rspamd.git

[Minor] Fix various cmake issues
---

diff --git a/clang-plugin/CMakeLists.txt b/clang-plugin/CMakeLists.txt
index eae764235..8b2def17e 100644
--- a/clang-plugin/CMakeLists.txt
+++ b/clang-plugin/CMakeLists.txt
@@ -4,7 +4,7 @@ IF (ENABLE_CLANG_PLUGIN MATCHES "ON")
         MESSAGE(FATAL_ERROR "Cannot build clang plugin when compiler is not clang")
     endif ()
 
-    SET(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${CMAKE_CURRENT_SOURCE_DIR}")
+    LIST(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}")
     ENABLE_LANGUAGE(CXX)
     FIND_PACKAGE(LLVM REQUIRED)
 
diff --git a/contrib/lua-torch/decisiontree/CMakeLists.txt b/contrib/lua-torch/decisiontree/CMakeLists.txt
index 6434eddd9..b94b4deb2 100644
--- a/contrib/lua-torch/decisiontree/CMakeLists.txt
+++ b/contrib/lua-torch/decisiontree/CMakeLists.txt
@@ -1,7 +1,4 @@
-SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR})
-
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6 FATAL_ERROR)
-CMAKE_POLICY(VERSION 2.6)
+LIST(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}")
 
 SET(src
    init.c
diff --git a/contrib/lua-torch/torch7/CMakeLists.txt b/contrib/lua-torch/torch7/CMakeLists.txt
index 7519e85d7..1c3995dbe 100644
--- a/contrib/lua-torch/torch7/CMakeLists.txt
+++ b/contrib/lua-torch/torch7/CMakeLists.txt
@@ -1,14 +1,4 @@
-IF(APPLE)
-  CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12 FATAL_ERROR)
-  CMAKE_POLICY(VERSION 2.8.12)
-ELSE()
-  CMAKE_MINIMUM_REQUIRED(VERSION 2.8 FATAL_ERROR)
-  CMAKE_POLICY(VERSION 2.8)
-ENDIF()
-
-SET(CMAKE_MODULE_PATH
-  "${CMAKE_CURRENT_SOURCE_DIR}/cmake"
-  "${CMAKE_MODULE_PATH}")
+LIST(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 
 IF (NOT MSVC)
   IF (MINGW)
@@ -18,14 +8,6 @@ IF (NOT MSVC)
   ENDIF(MINGW)
 ENDIF(NOT MSVC)
 
-# Flags
-# When using MSVC
-IF(MSVC)
-  # we want to respect the standard, and we are bored of those **** .
-  ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE=1)
-ENDIF(MSVC)
-
-
 IF (WITH_OPENMP)
   FIND_PACKAGE(OpenMP)
   IF(OPENMP_FOUND)
diff --git a/contrib/lua-torch/torch7/cmake/TorchConfig.cmake.in b/contrib/lua-torch/torch7/cmake/TorchConfig.cmake.in
index 3d85eb117..bafa04f91 100644
--- a/contrib/lua-torch/torch7/cmake/TorchConfig.cmake.in
+++ b/contrib/lua-torch/torch7/cmake/TorchConfig.cmake.in
@@ -18,7 +18,7 @@ SET(Torch_INSTALL_CMAKE_RIDBUS "@Torch_INSTALL_CMAKE_RIDBUS@")
 FILE(RELATIVE_PATH Torch_INSTALL_LUA_PATH_SUBDIR "${Torch_INSTALL_PREFIX}" "${CMAKE_INSTALL_PREFIX}/lua")
 FILE(RELATIVE_PATH Torch_INSTALL_LUA_CPATH_SUBDIR "${Torch_INSTALL_PREFIX}" "${CMAKE_INSTALL_PREFIX}/lib")
 
-SET(CMAKE_MODULE_PATH "${Torch_INSTALL_PREFIX}/${Torch_INSTALL_CMAKE_SUBDIR}" "${CMAKE_MODULE_PATH}")
+LIST(APPEND CMAKE_MODULE_PATH "${Torch_INSTALL_PREFIX}/${Torch_INSTALL_CMAKE_SUBDIR}")
 SET(CMAKE_INSTALL_PREFIX "${Torch_INSTALL_PREFIX}") # override
 
 INCLUDE(TorchPathsInit)
diff --git a/contrib/lua-torch/torch7/lib/TH/CMakeLists.txt b/contrib/lua-torch/torch7/lib/TH/CMakeLists.txt
index ef5bdd08c..b4f115f39 100644
--- a/contrib/lua-torch/torch7/lib/TH/CMakeLists.txt
+++ b/contrib/lua-torch/torch7/lib/TH/CMakeLists.txt
@@ -5,7 +5,7 @@ IF(POLICY CMP0026)
  CMAKE_POLICY(SET CMP0026 OLD)
 ENDIF()
 
-SET(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
+LIST(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 SET(CMAKE_LIBRARY_PATH /usr/lib/x86_64-linux-gnu/ ${CMAKE_LIBRARY_PATH})
 
 #######################################################################