diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2018-05-25 12:41:57 +0100 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2018-05-25 12:41:57 +0100 |
| commit | 2f08a47d852a3cfb75d27a82d65f7dbf77cbc8bd (patch) | |
| tree | 442ce06fdaa0c5dc6a1017b050bc9b8ffcd80190 /contrib | |
| parent | f9e27d77aa4c223034ab3601449e5dbaf5f281ad (diff) | |
| download | rspamd-2f08a47d852a3cfb75d27a82d65f7dbf77cbc8bd.tar.gz rspamd-2f08a47d852a3cfb75d27a82d65f7dbf77cbc8bd.zip | |
[Minor] Fix various cmake issues
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/lua-torch/decisiontree/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | contrib/lua-torch/torch7/CMakeLists.txt | 20 | ||||
| -rw-r--r-- | contrib/lua-torch/torch7/cmake/TorchConfig.cmake.in | 2 | ||||
| -rw-r--r-- | contrib/lua-torch/torch7/lib/TH/CMakeLists.txt | 2 |
4 files changed, 4 insertions, 25 deletions
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}) ####################################################################### |