diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2017-07-21 11:07:34 +0100 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2017-07-21 11:41:06 +0100 |
| commit | 43a0868d495ce58b1098b071dd3d7020138776c3 (patch) | |
| tree | b77d79a4e07202212dc702f7791cf760168bb7a4 /contrib/torch/torch7 | |
| parent | a55442e29e20b52ad4f6148c45664005898feaa7 (diff) | |
| download | rspamd-43a0868d495ce58b1098b071dd3d7020138776c3.tar.gz rspamd-43a0868d495ce58b1098b071dd3d7020138776c3.zip | |
[Minor] Fix installation directory for shared libs
Diffstat (limited to 'contrib/torch/torch7')
| -rw-r--r-- | contrib/torch/torch7/cmake/TorchPackage.cmake | 4 | ||||
| -rw-r--r-- | contrib/torch/torch7/lib/CMakeLists.txt | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/contrib/torch/torch7/cmake/TorchPackage.cmake b/contrib/torch/torch7/cmake/TorchPackage.cmake index 88457ba49..83af751ab 100644 --- 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 7841e7b29..d6a0e2c9c 100644 --- 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}") |