generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Made changes to OpenCVFindMatlab suggested by SpecLad

Browse Source
This commit is contained in:
hbristow 2013-09-14 13:32:15 +10:00
parent 232f11e256
commit 224f44a255
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@ -23,6 +23,7 @@
*.idl text *.idl text
*.java text *.java text
*.js text *.js text
*.m text
*.mk text *.mk text
*.mm text *.mm text
*.plist text *.plist text

8
cmake/OpenCVFindMatlab.cmake
View File

@ -15,7 +15,7 @@
# mexwin32, mexwin64, mexglx, mexa64, mexmac, # mexwin32, mexwin64, mexglx, mexa64, mexmac,
# mexmaci, mexmaci64, mexsol, mexs64 # mexmaci, mexmaci64, mexsol, mexs64
# MATLAB_ARCH: The installation architecture. It is **usually** # 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. # though it's different for linux distros.
# #
# There doesn't appear to be an elegant way to detect all versions of Matlab # 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) if (MATLAB_ROOT_DIR)
locate_matlab_components(${MATLAB_ROOT_DIR}) locate_matlab_components(${MATLAB_ROOT_DIR})
endif() endif()
find_package_handle_standard_args(Matlab DEFAULT_MSG find_package_handle_standard_args(Matlab DEFAULT_MSG
MATLAB_MEX_SCRIPT MATLAB_INCLUDE_DIRS MATLAB_MEX_SCRIPT MATLAB_INCLUDE_DIRS
MATLAB_ROOT_DIR MATLAB_LIBRARIES MATLAB_ROOT_DIR MATLAB_LIBRARIES
MATLAB_LIBRARY_DIRS MATLAB_MEXEXT MATLAB_LIBRARY_DIRS MATLAB_MEXEXT
MATLAB_ARCH MATLAB_BIN) MATLAB_ARCH MATLAB_BIN)
endif() endif()