From 224f44a255861419f955dd3d815ff2a1f1523323 Mon Sep 17 00:00:00 2001 From: hbristow Date: Sat, 14 Sep 2013 13:32:15 +1000 Subject: [PATCH] Made changes to OpenCVFindMatlab suggested by SpecLad --- .gitattributes | 1 + cmake/OpenCVFindMatlab.cmake | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitattributes b/.gitattributes index 35df6ca..7497ee1 100644 --- a/.gitattributes +++ b/.gitattributes @@ -23,6 +23,7 @@ *.idl text *.java text *.js text +*.m text *.mk text *.mm text *.plist text diff --git a/cmake/OpenCVFindMatlab.cmake b/cmake/OpenCVFindMatlab.cmake index b74f946..886cebe 100644 --- a/cmake/OpenCVFindMatlab.cmake +++ b/cmake/OpenCVFindMatlab.cmake @@ -15,7 +15,7 @@ # mexwin32, mexwin64, mexglx, mexa64, mexmac, # mexmaci, mexmaci64, mexsol, mexs64 # MATLAB_ARCH: The installation architecture. It is **usually** -# the MEXEXT with the preceding "mex" removed, +# the MEXEXT with the preceding "mex" removed, # though it's different for linux distros. # # There doesn't appear to be an elegant way to detect all versions of Matlab @@ -187,9 +187,9 @@ if (NOT MATLAB_FOUND) if (MATLAB_ROOT_DIR) locate_matlab_components(${MATLAB_ROOT_DIR}) endif() - find_package_handle_standard_args(Matlab DEFAULT_MSG + find_package_handle_standard_args(Matlab DEFAULT_MSG MATLAB_MEX_SCRIPT MATLAB_INCLUDE_DIRS - MATLAB_ROOT_DIR MATLAB_LIBRARIES - MATLAB_LIBRARY_DIRS MATLAB_MEXEXT + MATLAB_ROOT_DIR MATLAB_LIBRARIES + MATLAB_LIBRARY_DIRS MATLAB_MEXEXT MATLAB_ARCH MATLAB_BIN) endif() -- 2.7.4