[mlpack] 45/58: Use FATAL_ERROR instead of FATAL. Also find ARPACK quietly.

[Barak A. Pearlmutter]

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

bap pushed a commit to branch svn-trunk
in repository mlpack.

commit 17c169b067e1cfc5affad1d4f6987aa963fcfdac
Author: rcurtin <rcurtin at 9d5b8971-822b-0410-80eb-d18c1038ef23>
Date:   Fri Aug 22 21:29:29 2014 +0000

    Use FATAL_ERROR instead of FATAL.  Also find ARPACK quietly.
    
    
    git-svn-id: http://svn.cc.gatech.edu/fastlab/mlpack/trunk@17101 9d5b8971-822b-0410-80eb-d18c1038ef23
---
 CMake/FindArmadillo.cmake | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/CMake/FindArmadillo.cmake b/CMake/FindArmadillo.cmake
index 67ede3f..b8b5e8a 100644
--- a/CMake/FindArmadillo.cmake
+++ b/CMake/FindArmadillo.cmake
@@ -194,26 +194,27 @@ if(EXISTS "${ARMADILLO_INCLUDE_DIR}/armadillo_bits/config.hpp")
     endif (NOT "${ARMA_USE_LAPACK}" STREQUAL "" AND NOT HAVE_LAPACK)
 
     if (NOT "${ARMA_USE_LAPACK}" STREQUAL "" AND NOT LAPACK_FOUND)
-      message(FATAL "Cannot find LAPACK library, but ARMA_USE_LAPACK is set. "
-                    "Try specifying LAPACK libraries manually by setting the "
-                    "LAPACK_LIBRARY variable.")
+      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)
 
     if (NOT "${ARMA_USE_BLAS}" STREQUAL "" AND NOT BLAS_FOUND)
-      message(FATAL "Cannot find BLAS library, but ARMA_USE_BLAS is set.  Try "
-                    "specifying BLAS libraries manually by setting the "
-                    "BLAS_LIBRARY variable.")
+      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)
 
     # Search for ARPACK (or replacement).
     if (NOT "${ARMA_USE_ARPACK}" STREQUAL "")
       # Use Armadillo ARPACK-finding procedure.
+      set(ARPACK_FIND_QUIETLY true)
       include(ARMA_FindARPACK)
 
       if (NOT ARPACK_FOUND)
-        message(ERROR "ARMA_USE_ARPACK is defined in armadillo_bits/config.hpp,"
-                      " but ARPACK cannot be found.  Try specifying "
-                      "ARPACK_LIBRARY.")
+        message(FATAL_ERROR "ARMA_USE_ARPACK is defined in "
+            "armadillo_bits/config.hpp, but ARPACK cannot be found.  Try "
+            "specifying ARPACK_LIBRARY.")
       endif (NOT ARPACK_FOUND)
 
       set(SUPPORT_LIBRARIES "${SUPPORT_LIBRARIES}" "${ARPACK_LIBRARY}")

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