Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
de93408d
Commit
de93408d
authored
Mar 12, 2013
by
Hilton Bristow
Committed by
hbristow
Jun 17, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Better conformity to find_package requirements
parent
60d7acb4
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
15 deletions
+2
-15
OpenCVFindMatlab.cmake
cmake/OpenCVFindMatlab.cmake
+2
-15
No files found.
cmake/OpenCVFindMatlab.cmake
View file @
de93408d
...
...
@@ -113,21 +113,6 @@ MACRO(locate_matlab_components MATLAB_ROOT_DIR)
# get the mex shell script
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
()
...
...
@@ -148,6 +133,8 @@ if (NOT MATLAB_FOUND)
if
(
MATLAB_ROOT_DIR
)
locate_matlab_components
(
${
MATLAB_ROOT_DIR
}
)
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
(
NOT MATLAB_FOUND
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment