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
a659562c
Commit
a659562c
authored
Aug 07, 2013
by
hbristow
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Changed command-line separator from module:file to module=file so that it works cross-platform
parent
3bf41c28
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
CMakeLists.txt
modules/matlab/CMakeLists.txt
+3
-3
gen_matlab.py
modules/matlab/generator/gen_matlab.py
+2
-2
No files found.
modules/matlab/CMakeLists.txt
View file @
a659562c
...
...
@@ -76,7 +76,7 @@ ocv_add_module(matlab BINDINGS
# get the commit information
execute_process
(
COMMAND git log -1 --pretty=%H OUTPUT_VARIABLE GIT_COMMIT ERROR_QUIET
)
string
(
REGEX REPLACE
"(
\r
?
\n
)+$"
""
GIT_COMMIT
${
GIT_COMMIT
}
)
string
(
REGEX REPLACE
"(
\r
?
\n
)+$"
""
GIT_COMMIT
"
${
GIT_COMMIT
}
"
)
# set the path to the C++ header and doc parser
set
(
HDR_PARSER_PATH
${
CMAKE_SOURCE_DIR
}
/modules/python/src2
)
...
...
@@ -109,7 +109,7 @@ foreach(opencv_module ${MATLAB_DEPS})
endforeach
()
# add extra headers by hand
list
(
APPEND opencv_extra_hdrs
"core
:
${
OPENCV_MODULE_opencv_core_LOCATION
}
/include/opencv2/core/base.hpp"
)
list
(
APPEND opencv_extra_hdrs
"core
=
${
OPENCV_MODULE_opencv_core_LOCATION
}
/include/opencv2/core/base.hpp"
)
# pass the OPENCV_CXX_EXTRA_FLAGS through to the mex compiler
# remove the visibility modifiers, so the mex gateway is visible
...
...
@@ -131,7 +131,7 @@ if (NOT MEX_WORKS)
${
CMAKE_CURRENT_SOURCE_DIR
}
/generator/gen_matlab.py
--hdrparser
${
HDR_PARSER_PATH
}
--rstparser
${
RST_PARSER_PATH
}
--extra
"test
:
${
CMAKE_CURRENT_SOURCE_DIR
}
/test/test_generator.hpp"
--extra
"test
=
${
CMAKE_CURRENT_SOURCE_DIR
}
/test/test_generator.hpp"
--outdir
${
CMAKE_BINARY_DIR
}
/junk
ERROR_VARIABLE GEN_ERROR
OUTPUT_QUIET
...
...
modules/matlab/generator/gen_matlab.py
View file @
a659562c
...
...
@@ -27,8 +27,8 @@ class MatlabWrapperGenerator(object):
rst
.
definitions
=
{}
for
extra
in
extras
:
module
=
extra
.
split
(
"
:
"
)[
0
]
header
=
extra
.
split
(
"
:
"
)[
1
]
module
=
extra
.
split
(
"
=
"
)[
0
]
header
=
extra
.
split
(
"
=
"
)[
1
]
ns
[
module
]
=
ns
[
module
]
+
parser
.
parse
(
header
)
if
module
in
ns
else
parser
.
parse
(
header
)
# cleanify the parser output
...
...
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