Made cmake avoid using the Intel MKL when building mex files since it will

often create a conflict with MATLAB's copy of the MKL.

dlib/cmake_find_blas.txt

@@ -47,6 +47,10 @@ if (UNIX)
    include(CheckLibraryExists)
 
 
+   # Don't try to use the Intel MKL when we are building a MATLAB mex file
+   # since it will usually conflict with MATLAB's copy of the MKL and cause
+   # problems.
+   if (NOT BUILDING_MATLAB_MEX_FILE)
         # Search for the needed libraries from the MKL.  We will try to link against the mkl_rt
         # file first since this way avoids linking bugs in some cases.
         find_library(mkl_rt mkl_rt ${mkl_search_path})
@@ -61,8 +65,6 @@ if (UNIX)
             message(STATUS "Found Intel MKL BLAS/LAPACK library")
         endif()
 
-
-
         if (NOT found_intel_mkl)
             # Search for the needed libraries from the MKL.  This time try looking for a different
             # set of MKL files and try to link against those.
@@ -82,6 +84,7 @@ if (UNIX)
                 message(STATUS "Found Intel MKL BLAS/LAPACK library")
             endif()
         endif()
+   endif()
 
 
    # try to find some other LAPACK libraries if we didn't find the MKL
@@ -96,6 +99,7 @@ if (UNIX)
         /usr/lib/atlas
         /usr/lib/openblas-base
         /opt/OpenBLAS/lib
+        $ENV{OPENBLAS_HOME}/lib
         )
 
    INCLUDE (CheckFunctionExists)

dlib/matlab/cmake_mex_wrapper

@@ -5,6 +5,7 @@
 
 cmake_minimum_required(VERSION 2.8.4)
 
+set(BUILDING_MATLAB_MEX_FILE true)
 
 # Find MATLAB's include directory and needed libraries 
 find_program(MATLAB_EXECUTABLE matlab PATHS