[mlpack-svn] r14716 - mlpack/trunk/CMake

fastlab-svn at coffeetalk-1.cc.gatech.edu fastlab-svn at coffeetalk-1.cc.gatech.edu
Fri Mar 29 19:10:23 EDT 2013


Author: rcurtin
Date: 2013-03-29 19:10:23 -0400 (Fri, 29 Mar 2013)
New Revision: 14716

Modified:
   mlpack/trunk/CMake/FindArmadillo.cmake
Log:
Clean up output a little bit.


Modified: mlpack/trunk/CMake/FindArmadillo.cmake
===================================================================
--- mlpack/trunk/CMake/FindArmadillo.cmake	2013-03-29 23:06:45 UTC (rev 14715)
+++ mlpack/trunk/CMake/FindArmadillo.cmake	2013-03-29 23:10:23 UTC (rev 14716)
@@ -81,10 +81,10 @@
   file(READ "${ARMADILLO_INCLUDE_DIR}/armadillo_bits/config.hpp" _armadillo_CONFIG_CONTENTS)
   string(REGEX MATCH "[\r\n][\t ]*#define[ \t]+ARMA_USE_HDF5[ \t\r\n]" ARMA_USE_HDF5 "${_armadillo_CONFIG_CONTENTS}")
 
-  message("arma_use_hdf5: ${ARMA_USE_HDF5}")
   if(NOT "${ARMA_USE_HDF5}" STREQUAL "")
+    message(STATUS "Armadillo HDF5 support is enabled.")
     # We have HDF5 support and need to link against HDF5.
-    find_package(HDF5)
+    find_package(HDF5 REQUIRED)
   endif(NOT "${ARMA_USE_HDF5}" STREQUAL "")
 endif(EXISTS "${ARMADILLO_INCLUDE_DIR}/armadillo_bits/config.hpp")
 
@@ -104,9 +104,7 @@
   set(ARMADILLO_LIBRARIES ${ARMADILLO_LIBRARY} ${HDF5_LIBRARIES})
 endif (ARMADILLO_FOUND)
 
-message("Armadillo libraries: ${ARMADILLO_LIBRARIES}")
 
-
 # Hide internal variables
 mark_as_advanced(
   ARMADILLO_INCLUDE_DIR




More information about the mlpack-svn mailing list