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

Better conformity to find_package requirements

Browse Source
This commit is contained in:
Hilton Bristow 2013-03-12 14:34:23 +10:00 committed by hbristow
parent 60d7acb4fc
commit de93408dec
1 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
cmake/OpenCVFindMatlab.cmake
View File

@ -113,21 +113,6 @@ MACRO(locate_matlab_components MATLAB_ROOT_DIR)
# get the mex shell script # get the mex shell script
find_file(MATLAB_MEX_SCRIPT NAMES mex mex.bat PATHS ${MATLAB_ROOT_DIR}/bin NO_DEFAULT_PATH) find_file(MATLAB_MEX_SCRIPT NAMES mex mex.bat PATHS ${MATLAB_ROOT_DIR}/bin NO_DEFAULT_PATH)
# verify that everything has been found successfully
if (MATLAB_LIB_MX AND MATLAB_LIB_MEX AND MATLAB_LIB_MAT AND MATLAB_INCLUDE_DIRS AND MATLAB_MEX_SCRIPT)
set(MATLAB_FOUND TRUE)
else()
unset(MATLAB_LIB_MX)
unset(MATLAB_LIB_MEX)
unset(MATLAB_LIB_MAT)
unset(MATLAB_LIBS)
unset(MATLAB_LIBRARY_DIRS)
unset(MATLAB_INCLUDE_DIRS)
unset(MATLAB_ROOT_DIR)
unset(MATLAB_MEXEXT)
unset(MATLAB_MEX_SCRIPT)
unset(MATLAB_ARCH)
endif()
endMACRO() endMACRO()
@ -148,6 +133,8 @@ 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 MATLAB_MEX_SCRIPT MATLAB_INCLUDE_DIRS
MATLAB_LIBS MATLAB_LIBRARY_DIRS MATLAB_MEXEXT MATLAB_ARCH)
# if Matlab was not found, unset the local variables # if Matlab was not found, unset the local variables
if (NOT MATLAB_FOUND) if (NOT MATLAB_FOUND)