[mlpack-svn] r13712 - mlpack/trunk/CMake
fastlab-svn at coffeetalk-1.cc.gatech.edu
fastlab-svn at coffeetalk-1.cc.gatech.edu
Mon Oct 15 19:48:34 EDT 2012
Author: rcurtin
Date: 2012-10-15 19:48:34 -0400 (Mon, 15 Oct 2012)
New Revision: 13712
Modified:
mlpack/trunk/CMake/FindMatlabMex.cmake
Log:
Actually issue errors when mex is not found.
Modified: mlpack/trunk/CMake/FindMatlabMex.cmake
===================================================================
--- mlpack/trunk/CMake/FindMatlabMex.cmake 2012-10-15 23:37:03 UTC (rev 13711)
+++ mlpack/trunk/CMake/FindMatlabMex.cmake 2012-10-15 23:48:34 UTC (rev 13712)
@@ -2,9 +2,9 @@
# The following variables are defined when the script completes:
# MATLAB_MEX: location of mex compiler
# MATLAB_ROOT: root of MATLAB installation
-# MATLAB_MEX_FOUND: 0 if not found, 1 if found
+# MATLABMEX_FOUND: 0 if not found, 1 if found
-SET(MATLAB_MEX_FOUND 0)
+SET(MATLABMEX_FOUND 0)
IF(WIN32)
# This is untested but taken from the older FindMatlab.cmake script as well as
@@ -92,16 +92,17 @@
ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
ENDIF(WIN32)
-IF(MATLAB_MEX)
- SET(MATLAB_MEX_FOUND 1)
-ENDIF(MATLAB_MEX)
+IF(NOT "${MATLAB_MEX}" AND "${MatlabMex_FIND_REQUIRED}")
+ MESSAGE(FATAL_ERROR "Could not find MATLAB mex compiler; try specifying MATLAB_ROOT.")
+ELSE(NOT "${MATLAB_MEX}" AND "${MatlabMex_FIND_REQUIRED}")
+ MESSAGE(STATUS "Found MATLAB mex compiler: ${MATLAB_MEX}")
+ MESSAGE(STATUS "MATLAB root: ${MATLAB_ROOT}")
+ENDIF(NOT "${MATLAB_MEX}" AND "${MatlabMex_FIND_REQUIRED}")
-MESSAGE(STATUS "Found MATLAB mex compiler: ${MATLAB_MEX}")
-MESSAGE(STATUS "MATLAB root: ${MATLAB_ROOT}")
MARK_AS_ADVANCED(
MATLAB_MEX
- MATLAB_MEX_FOUND
+ MATLABMEX_FOUND
MATLAB_ROOT
)
More information about the mlpack-svn
mailing list