From 9b32c6e6535b2c2870e07079c33c5ada0e6c4f84 Mon Sep 17 00:00:00 2001 From: hbristow Date: Sun, 23 Jun 2013 22:44:12 -0700 Subject: [PATCH] Updated README --- README.md | 17 ++++++----------- cmake/OpenCVFindMatlab.cmake | 4 ++++ 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 090b75d99..fbe596917 100644 --- a/README.md +++ b/README.md @@ -4,19 +4,14 @@ An open source computer vision library Matlab Generator ---------------- -This project is a fork of OpenCV (https://github.com/Itseez/opencv/) with a matlab module for automagically generating Matlab bindings. Once complete, this branch will be merged into the OpenCV 3.x master. +This project is a fork of OpenCV (https://github.com/Itseez/opencv/) with a matlab module for automatically generating Matlab bindings. Once complete, this branch will be merged into the OpenCV 3.x master. -This project is currently, and always will be, in a semi-working state. When the project is stable it will be merged, and this fork deleted. - -Features --------- -If you have any feature requests, please file them through the tracker +This project is currently, and always will be, in a semi-working state. When the project is stable and merged, this fork will be deleted. Thus, this repository stands as a point to share progress with the community, host a bugtracker for bug reports and (public!) feature requests, and enable discussion about design decisions. GSOC ---- -This project repesents my GSOC project for 2013. You can find more details about my proposal in proposal.pdf in the root +This project repesents my Google Summer of Code (GSOC) project for 2013. +You can find more details about my proposal in proposal.pdf in the root. - - - -Hilton +**Keywords** +opencv, matlab, bindings, code, generator, GSOC, mex, C++, wrappers diff --git a/cmake/OpenCVFindMatlab.cmake b/cmake/OpenCVFindMatlab.cmake index 922d31372..2a3fd173f 100644 --- a/cmake/OpenCVFindMatlab.cmake +++ b/cmake/OpenCVFindMatlab.cmake @@ -6,6 +6,7 @@ # # MATLAB_FOUND: true/false # MATLAB_ROOT_DIR: Root of Matlab installation +# MATLAB_BIN: The main Matlab "executable" (shell script) # MATLAB_MEX_SCRIPT: The mex script used to compile mex files # MATLAB_BIN: The actual Matlab executable # MATLAB_INCLUDE_DIR: Path to "mex.h" @@ -37,6 +38,7 @@ function(locate_matlab_root) foreach (DIR_ ${SEARCH_DIRS_}) file(GLOB MATLAB_ROOT_DIR_ ${DIR_}/*matlab*) if (MATLAB_ROOT_DIR_) + # sort in order from highest to lowest list(SORT MATLAB_ROOT_DIR_) list(REVERSE MATLAB_ROOT_DIR_) list(GET MATLAB_ROOT_DIR_ 0 MATLAB_ROOT_DIR_) @@ -51,6 +53,8 @@ function(locate_matlab_root) foreach (DIR_ ${SEARCH_DIRS_}) file(GLOB MATLAB_ROOT_DIR_ ${DIR_}/*matlab*) if (MATLAB_ROOT_DIR_) + # sort in order from highest to lowest + # normally it's in the format MATLAB_R[20XX][A/B] list(SORT MATLAB_ROOT_DIR_) list(REVERSE MATLAB_ROOT_DIR_) list(GET MATLAB_ROOT_DIR_ 0 MATLAB_ROOT_DIR_)