[mlpack-svn] r13943 - mlpack/trunk/src/mlpack/bindings/matlab

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

Author: rcurtin
Date: 2012-11-28 15:49:47 -0500 (Wed, 28 Nov 2012)
New Revision: 13943

Modified:
   mlpack/trunk/src/mlpack/bindings/matlab/CMakeLists.txt
Log:
Add a few new bindings and make the mex compiler required if compiled with
-DMATLAB_BINDINGS=ON.


Modified: mlpack/trunk/src/mlpack/bindings/matlab/CMakeLists.txt
===================================================================
--- mlpack/trunk/src/mlpack/bindings/matlab/CMakeLists.txt	2012-11-28 20:48:53 UTC (rev 13942)
+++ mlpack/trunk/src/mlpack/bindings/matlab/CMakeLists.txt	2012-11-28 20:49:47 UTC (rev 13943)
@@ -2,15 +2,8 @@
 # non-Linux systems.
 
 # We need the mex compiler for this to work.
-find_package(MatlabMex)
+find_package(MatlabMex REQUIRED)
 
-if(NOT ${MATLABMEX_FOUND})
-  message(STATUS
-      "MATLAB mex compiler not found; MATLAB bindings will not be built.")
-  message(STATUS "If MATLAB is installed, try specifying MATLAB_ROOT.")
-  return()
-endif(NOT ${MATLABMEX_FOUND})
-
 # If the mex compiler is wrapping an "unsupported" version, warn the user that
 # they may have issues with the produced bindings for a multitude of reasons.
 # We can only reasonably check this on a UNIX-like system.
@@ -49,7 +42,7 @@
       endif(NOT ("${MEX_COMPILER_VERSION}" VERSION_LESS
           "${OTHER_COMPILER_VERSION}"))
     endif(MEX_COMPILER_VERSION AND OTHER_COMPILER_VERSION)
-      
+
     if(NEED_TO_WARN EQUAL 1)
       message(WARNING "The MATLAB runtime glibc is different than the system "
           " glibc.  This can (and probably will) cause the MLPACK bindings "
@@ -126,6 +119,8 @@
 set(MATLAB_TOOLBOX_DIR "${MATLAB_ROOT}/toolbox")
 
 # CHANGE HERE FOR NEW BINDINGS!!!!
+add_subdirectory(allkfn)
+add_subdirectory(allknn)
 add_subdirectory(emst)
 add_subdirectory(kmeans)
 add_subdirectory(range_search)
@@ -145,7 +140,12 @@
         ${CMAKE_SOURCE_DIR}/CMake/ModifyMatlabPathdef.cmake
     # Due to the dependencies, 'make matlab' makes all the bindings.
     DEPENDS
+    allknn_mex
+    allkfn_mex
     emst_mex
+    gmm_mex
+    kmeans_mex
+    range_search_mex
 )
 
 install(FILES "${CMAKE_BINARY_DIR}/matlab/pathdef.m"