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

[fastlab-svn at coffeetalk-1.cc.gatech.edu]

Author: rcurtin
Date: 2012-10-15 23:46:34 -0400 (Mon, 15 Oct 2012)
New Revision: 13716

Modified:
   mlpack/trunk/CMake/FindMatlabMex.cmake
Log:
Further clean up script and handle things better when MATLAB does exist.


Modified: mlpack/trunk/CMake/FindMatlabMex.cmake
===================================================================
--- mlpack/trunk/CMake/FindMatlabMex.cmake	2012-10-16 03:13:37 UTC (rev 13715)
+++ mlpack/trunk/CMake/FindMatlabMex.cmake	2012-10-16 03:46:34 UTC (rev 13716)
@@ -92,14 +92,15 @@
   ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
 ENDIF(WIN32)
 
-IF(NOT "${MATLAB_MEX}" AND "${MatlabMex_FIND_REQUIRED}")
+IF(NOT EXISTS "${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}")
-  IF("${MATLAB_MEX}")
+ELSE(NOT EXISTS "${MATLAB_MEX}" AND "${MatlabMex_FIND_REQUIRED}")
+  IF(EXISTS "${MATLAB_MEX}")
     MESSAGE(STATUS "Found MATLAB mex compiler: ${MATLAB_MEX}")
     MESSAGE(STATUS "MATLAB root: ${MATLAB_ROOT}")
-  ENDIF("${MATLAB_MEX}")
-ENDIF(NOT "${MATLAB_MEX}" AND "${MatlabMex_FIND_REQUIRED}")
+    SET(MATLABMEX_FOUND 1)
+  ENDIF(EXISTS "${MATLAB_MEX}")
+ENDIF(NOT EXISTS "${MATLAB_MEX}" AND "${MatlabMex_FIND_REQUIRED}")
 
 MARK_AS_ADVANCED(
   MATLAB_MEX