Skip to content

O
opencv
Commit b3ac2746 authored by Vadim Pisarevsky's avatar Vadim Pisarevsky
Browse files
Options

Merge pull request #5455 from michaelveth:matlab_cmake_unix_fix

parents de49ed3c a3fda245
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
cmake/OpenCVFindMatlab.cmake
View file @ b3ac2746
...@@ -62,7 +62,7 @@ function(locate_matlab_root) ...@@ -62,7 +62,7 @@ function(locate_matlab_root)
# possible root locations, in order of likelihood # possible root locations, in order of likelihood
set(SEARCH_DIRS_ /Applications /usr/local /opt/local /usr /opt) set(SEARCH_DIRS_ /Applications /usr/local /opt/local /usr /opt)
foreach (DIR_ ${SEARCH_DIRS_}) foreach (DIR_ ${SEARCH_DIRS_})
file(GLOB MATLAB_ROOT_DIR_ ${DIR_}/*matlab*) file(GLOB MATLAB_ROOT_DIR_ ${DIR_}/MATLAB/R*)
if (MATLAB_ROOT_DIR_) if (MATLAB_ROOT_DIR_)
# sort in order from highest to lowest # sort in order from highest to lowest
# normally it's in the format MATLAB_R[20XX][A/B] # normally it's in the format MATLAB_R[20XX][A/B]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment