[mlpack-git] master: Use FATAL_ERROR instead of FATAL. Also find ARPACK quietly. (d0e6102)
gitdub at big.cc.gt.atl.ga.us
gitdub at big.cc.gt.atl.ga.us
Thu Mar 5 21:59:34 EST 2015
Repository : https://github.com/mlpack/mlpack
On branch : master
Link : https://github.com/mlpack/mlpack/compare/904762495c039e345beba14c1142fd719b3bd50e...f94823c800ad6f7266995c700b1b630d5ffdcf40
>---------------------------------------------------------------
commit d0e6102d7b3416714c15b7f7edac3afc1cace3c8
Author: Ryan Curtin <ryan at ratml.org>
Date: Fri Aug 22 21:29:29 2014 +0000
Use FATAL_ERROR instead of FATAL. Also find ARPACK quietly.
>---------------------------------------------------------------
d0e6102d7b3416714c15b7f7edac3afc1cace3c8
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}")
More information about the mlpack-git
mailing list