Index: head/mail/rspamd/files/patch-contrib_torch_torch7_lib_TH_CMakeLists.txt =================================================================== --- head/mail/rspamd/files/patch-contrib_torch_torch7_lib_TH_CMakeLists.txt (revision 464768) +++ head/mail/rspamd/files/patch-contrib_torch_torch7_lib_TH_CMakeLists.txt (revision 464769) @@ -1,92 +1,44 @@ --- contrib/torch/torch7/lib/TH/CMakeLists.txt.orig 2018-03-12 16:46:32 UTC +++ contrib/torch/torch7/lib/TH/CMakeLists.txt -@@ -230,22 +230,28 @@ ELSE() +@@ -230,22 +230,26 @@ ELSE() ENDIF() ENDIF() -FIND_PACKAGE(BLAS) -IF(BLAS_FOUND) - SET(USE_BLAS 1) - TARGET_LINK_LIBRARIES(TH ${BLAS_LIBRARIES}) - IF(BLAS_INFO STREQUAL "mkl") - ADD_DEFINITIONS(-DTH_BLAS_MKL) - ELSEIF(BLAS_INFO STREQUAL "open") - ADD_DEFINITIONS(-DTH_BLAS_OPEN) - ENDIF() -ENDIF(BLAS_FOUND) +IF(WITH_BLAS) -+ MESSAGE(STATUS "XXXC: will find BLAS") + FIND_PACKAGE(BLAS) + IF(BLAS_FOUND) -+ MESSAGE(STATUS "XXXC: BLAS was found") -+ SET(USE_BLAS 1) -+ TARGET_LINK_LIBRARIES(TH ${BLAS_LIBRARIES}) -+ IF(BLAS_INFO STREQUAL "mkl") -+ ADD_DEFINITIONS(-DTH_BLAS_MKL) -+ ELSEIF(BLAS_INFO STREQUAL "open") -+ ADD_DEFINITIONS(-DTH_BLAS_OPEN) -+ ENDIF() -+ ENDIF(BLAS_FOUND) -+ENDIF(WITH_BLAS) - --FIND_PACKAGE(LAPACK) --IF(LAPACK_FOUND) -- SET(USE_LAPACK 1) -- TARGET_LINK_LIBRARIES(TH ${LAPACK_LIBRARIES}) --ENDIF(LAPACK_FOUND) -+IF(WITH_LAPACK) -+ FIND_PACKAGE(LAPACK) -+ IF(LAPACK_FOUND) -+ SET(USE_LAPACK 1) -+ TARGET_LINK_LIBRARIES(TH ${LAPACK_LIBRARIES}) -+ ENDIF(LAPACK_FOUND) -+ENDIF(WITH_LAPACK) - - IF (UNIX AND NOT APPLE) - INCLUDE(CheckLibraryExists) ---- contrib/torch/torch7/lib/TH/CMakeLists.txt.orig 2018-03-12 16:46:32 UTC -+++ contrib/torch/torch7/lib/TH/CMakeLists.txt -@@ -230,22 +230,28 @@ ELSE() - ENDIF() - ENDIF() - --FIND_PACKAGE(BLAS) --IF(BLAS_FOUND) -- SET(USE_BLAS 1) -- TARGET_LINK_LIBRARIES(TH ${BLAS_LIBRARIES}) -- IF(BLAS_INFO STREQUAL "mkl") -- ADD_DEFINITIONS(-DTH_BLAS_MKL) -- ELSEIF(BLAS_INFO STREQUAL "open") -- ADD_DEFINITIONS(-DTH_BLAS_OPEN) -- ENDIF() --ENDIF(BLAS_FOUND) -+IF(WITH_BLAS) -+ MESSAGE(STATUS "XXXC: will find BLAS") -+ FIND_PACKAGE(BLAS) -+ IF(BLAS_FOUND) -+ MESSAGE(STATUS "XXXC: BLAS was found") + SET(USE_BLAS 1) + TARGET_LINK_LIBRARIES(TH ${BLAS_LIBRARIES}) + IF(BLAS_INFO STREQUAL "mkl") + ADD_DEFINITIONS(-DTH_BLAS_MKL) + ELSEIF(BLAS_INFO STREQUAL "open") + ADD_DEFINITIONS(-DTH_BLAS_OPEN) + ENDIF() + ENDIF(BLAS_FOUND) +ENDIF(WITH_BLAS) -FIND_PACKAGE(LAPACK) -IF(LAPACK_FOUND) - SET(USE_LAPACK 1) - TARGET_LINK_LIBRARIES(TH ${LAPACK_LIBRARIES}) -ENDIF(LAPACK_FOUND) +IF(WITH_LAPACK) + FIND_PACKAGE(LAPACK) + IF(LAPACK_FOUND) + SET(USE_LAPACK 1) + TARGET_LINK_LIBRARIES(TH ${LAPACK_LIBRARIES}) + ENDIF(LAPACK_FOUND) +ENDIF(WITH_LAPACK) IF (UNIX AND NOT APPLE) INCLUDE(CheckLibraryExists)