From a3fda24597257cd6a6eee07bd12c003bd03c014d Mon Sep 17 00:00:00 2001 From: michaelveth Date: Tue, 6 Oct 2015 04:17:40 -0500 Subject: [PATCH] Update OpenCVFindMatlab.cmake Added fix to OpenCVFindMatlab.cmake to properly locate modern versions of unix- MATLAB. Tested with MATLAB R2015a and Ubuntu 14.04. --- cmake/OpenCVFindMatlab.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/OpenCVFindMatlab.cmake b/cmake/OpenCVFindMatlab.cmake index 576a07b5f4..65ad965c3d 100644 --- a/cmake/OpenCVFindMatlab.cmake +++ b/cmake/OpenCVFindMatlab.cmake @@ -62,7 +62,7 @@ function(locate_matlab_root) # possible root locations, in order of likelihood set(SEARCH_DIRS_ /Applications /usr/local /opt/local /usr /opt) foreach (DIR_ ${SEARCH_DIRS_}) - file(GLOB MATLAB_ROOT_DIR_ ${DIR_}/*matlab*) + file(GLOB MATLAB_ROOT_DIR_ ${DIR_}/MATLAB/R*) if (MATLAB_ROOT_DIR_) # sort in order from highest to lowest # normally it's in the format MATLAB_R[20XX][A/B]