[mlpack] 21/40: Fix typo: we should be checking HAVE_LAPACK not LAPACK_FOUND.

Barak A. Pearlmutter barak+git at pearlmutter.net
Mon Feb 15 19:34:24 UTC 2016


This is an automated email from the git hooks/post-receive script.

bap pushed a commit to branch master
in repository mlpack.

commit a8b510033ea1b115da5f7e5b25a14e5607c5cd1b
Author: Ryan Curtin <ryan at ratml.org>
Date:   Wed Jan 27 07:34:18 2016 -0800

    Fix typo: we should be checking HAVE_LAPACK not LAPACK_FOUND.
    
    LAPACK_FOUND is only set if MKL/ACML/etc. isn't found, but HAVE_LAPACK is set in
    both situations.
---
 CMake/FindArmadillo.cmake | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/CMake/FindArmadillo.cmake b/CMake/FindArmadillo.cmake
index 35e3921..94e947f 100644
--- a/CMake/FindArmadillo.cmake
+++ b/CMake/FindArmadillo.cmake
@@ -192,17 +192,17 @@ if(EXISTS "${ARMADILLO_INCLUDE_DIR}/armadillo_bits/config.hpp")
       endif ()
     endif (NOT "${ARMA_USE_LAPACK}" STREQUAL "" AND NOT HAVE_LAPACK)
 
-    if (NOT "${ARMA_USE_LAPACK}" STREQUAL "" AND NOT LAPACK_FOUND)
+    if (NOT "${ARMA_USE_LAPACK}" STREQUAL "" AND NOT HAVE_LAPACK)
       message(FATAL_ERROR "Cannot find LAPACK library, but ARMA_USE_LAPACK is "
           "set. Try specifying LAPACK libraries manually by setting the "
           "LAPACK_LIBRARY variable.")
-    endif (NOT "${ARMA_USE_LAPACK}" STREQUAL "" AND NOT LAPACK_FOUND)
+    endif (NOT "${ARMA_USE_LAPACK}" STREQUAL "" AND NOT HAVE_LAPACK)
 
-    if (NOT "${ARMA_USE_BLAS}" STREQUAL "" AND NOT BLAS_FOUND)
+    if (NOT "${ARMA_USE_BLAS}" STREQUAL "" AND NOT HAVE_BLAS)
       message(FATAL_ERROR "Cannot find BLAS library, but ARMA_USE_BLAS is set. "
           "Try specifying BLAS libraries manually by setting the BLAS_LIBRARY "
           "variable.")
-    endif (NOT "${ARMA_USE_BLAS}" STREQUAL "" AND NOT BLAS_FOUND)
+    endif (NOT "${ARMA_USE_BLAS}" STREQUAL "" AND NOT HAVE_BLAS)
 
     # Search for ARPACK (or replacement).
     if (NOT "${ARMA_USE_ARPACK}" STREQUAL "")

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/mlpack.git



More information about the debian-science-commits mailing list