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

Streamlined mexext detection, with removal of trailing whitespace/newlines handled by execute_process

Browse Source
This commit is contained in:
hbristow 2013-09-15 23:53:29 +10:00
parent 86b7e3d15d
commit 31c58d23e0
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cmake/OpenCVFindMatlab.cmake
View File

@ -125,15 +125,13 @@ endfunction()
# sets the variable MATLAB_FOUND to TRUE # sets the variable MATLAB_FOUND to TRUE
function(locate_matlab_components MATLAB_ROOT_DIR) function(locate_matlab_components MATLAB_ROOT_DIR)
# get the mex extension # get the mex extension
if (UNIX) find_file(MATLAB_MEXEXT_SCRIPT_ NAMES mexext mexext.bat PATHS ${MATLAB_ROOT_DIR}/bin NO_DEFAULT_PATH)
execute_process(COMMAND ${MATLAB_ROOT_DIR}/bin/mexext OUTPUT_VARIABLE MATLAB_MEXEXT_) execute_process(COMMAND ${MATLAB_MEXEXT_SCRIPT_}
elseif (WIN32) OUTPUT_VARIABLE MATLAB_MEXEXT_
execute_process(COMMAND ${MATLAB_ROOT_DIR}/bin/mexext.bat OUTPUT_VARIABLE MATLAB_MEXEXT_) OUTPUT_STRIP_TRAILING_WHITESPACE)
endif()
if (NOT MATLAB_MEXEXT_) if (NOT MATLAB_MEXEXT_)
return() return()
endif() endif()
string(STRIP ${MATLAB_MEXEXT_} MATLAB_MEXEXT_)
# map the mexext to an architecture extension # map the mexext to an architecture extension
set(ARCHITECTURES_ "maci64" "maci" "glnxa64" "glnx64" "sol64" "sola64" "win32" "win64" ) set(ARCHITECTURES_ "maci64" "maci" "glnxa64" "glnx64" "sol64" "sola64" "win32" "win64" )