[Minor] Fix installation directory for shared libs

diff --git a/contrib/torch/nn/lib/CMakeLists.txt b/contrib/torch/nn/lib/CMakeLists.txt
index a8d1f98471e2b2ad33c90dcae997677e4165c3fd..de04595f6b0d7c69eaeafaa8a85864c200b4ee90 100644 (file)
--- a/contrib/torch/nn/lib/CMakeLists.txt
+++ b/contrib/torch/nn/lib/CMakeLists.txt
@@ -1,5 +1,5 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6 FATAL_ERROR)
 CMAKE_POLICY(VERSION 2.6)
-SET(THNN_INSTALL_LIB_SUBDIR "${LUALIBDIR}")
+SET(THNN_INSTALL_LIB_SUBDIR "${RSPAMD_LIBDIR}")
 SET(THNN_INSTALL_INCLUDE_SUBDIR "${Torch_INSTALL_INCLUDE_SUBDIR}")
 ADD_SUBDIRECTORY(THNN)
\ No newline at end of file

diff --git a/contrib/torch/nn/lib/THNN/CMakeLists.txt b/contrib/torch/nn/lib/THNN/CMakeLists.txt
index 914e512d7527cc82e3200f0df292c028d7ea8c09..00908a5b12f9348177bdc32d21d66f55329ea686 100644 (file)
--- a/contrib/torch/nn/lib/THNN/CMakeLists.txt
+++ b/contrib/torch/nn/lib/THNN/CMakeLists.txt
@@ -36,7 +36,7 @@ IF (WITH_OPENMP)
 ENDIF (WITH_OPENMP)
 
 SET(src init.c)
-ADD_LIBRARY(THNN MODULE init.c)
+ADD_LIBRARY(THNN SHARED init.c)
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 ### Torch packages supposes libraries prefix is "lib"
 SET_TARGET_PROPERTIES(THNN PROPERTIES
@@ -44,4 +44,4 @@ SET_TARGET_PROPERTIES(THNN PROPERTIES
   IMPORT_PREFIX "lib")
 
 TARGET_LINK_LIBRARIES(THNN ${TH_LIBRARIES})
-INSTALL(TARGETS THNN DESTINATION ${LUALIBDIR})
+INSTALL(TARGETS THNN DESTINATION ${RSPAMD_LIBDIR})

diff --git a/contrib/torch/torch7/cmake/TorchPackage.cmake b/contrib/torch/torch7/cmake/TorchPackage.cmake
index 88457ba499a50f28b3299222c97313fc3068cb4f..83af751abd48367d44cb3b76e882538af1163612 100644 (file)
--- a/contrib/torch/torch7/cmake/TorchPackage.cmake
+++ b/contrib/torch/torch7/cmake/TorchPackage.cmake
@@ -14,7 +14,7 @@ MACRO(ADD_TORCH_LIBRARY package type src)
       ADD_LIBRARY(${package} ${type} ${src})
     endif()
   ENDIF()
-    INSTALL(TARGETS ${package} DESTINATION ${LUALIBDIR})
+    INSTALL(TARGETS ${package} DESTINATION ${RSPAMD_LIBDIR})
 ENDMACRO()
 
 MACRO(ADD_TORCH_PACKAGE package src luasrc)
@@ -41,7 +41,7 @@ MACRO(ADD_TORCH_PACKAGE package src luasrc)
             COMPILE_FLAGS "-fPIC")
     SET_TARGET_PROPERTIES(${package} PROPERTIES
             PREFIX "lib" IMPORT_PREFIX "lib" OUTPUT_NAME "${package}")
-    INSTALL(TARGETS ${package} DESTINATION ${LUALIBDIR})
+    INSTALL(TARGETS ${package} DESTINATION ${RSPAMD_LIBDIR})
 
   ENDIF(NOT "${src}" STREQUAL "")
 

diff --git a/contrib/torch/torch7/lib/CMakeLists.txt b/contrib/torch/torch7/lib/CMakeLists.txt
index 7841e7b29c56a5c18e9c7d482fd4cdb72d61a0d9..d6a0e2c9c088d65b9c3ec3502cdbb4c098c79d67 100644 (file)
--- a/contrib/torch/torch7/lib/CMakeLists.txt
+++ b/contrib/torch/torch7/lib/CMakeLists.txt
@@ -1,5 +1,5 @@
 SET(TH_INSTALL_BIN_SUBDIR "${BINDIR}")
-SET(TH_INSTALL_LIB_SUBDIR "${LUALIBDIR}")
+SET(TH_INSTALL_LIB_SUBDIR "${RSPAMD_LIBDIR}")
 SET(TH_INSTALL_INCLUDE_SUBDIR "${Torch_INSTALL_INCLUDE_SUBDIR}")
 SET(TH_INSTALL_CMAKE_SUBDIR "${Torch_INSTALL_CMAKE_SUBDIR}")