Commit a659562c authored by hbristow's avatar hbristow

Changed command-line separator from module:file to module=file so that it works cross-platform

parent 3bf41c28
...@@ -76,7 +76,7 @@ ocv_add_module(matlab BINDINGS ...@@ -76,7 +76,7 @@ ocv_add_module(matlab BINDINGS
# get the commit information # get the commit information
execute_process(COMMAND git log -1 --pretty=%H OUTPUT_VARIABLE GIT_COMMIT ERROR_QUIET) 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 the path to the C++ header and doc parser
set(HDR_PARSER_PATH ${CMAKE_SOURCE_DIR}/modules/python/src2) set(HDR_PARSER_PATH ${CMAKE_SOURCE_DIR}/modules/python/src2)
...@@ -109,7 +109,7 @@ foreach(opencv_module ${MATLAB_DEPS}) ...@@ -109,7 +109,7 @@ foreach(opencv_module ${MATLAB_DEPS})
endforeach() endforeach()
# add extra headers by hand # 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 # pass the OPENCV_CXX_EXTRA_FLAGS through to the mex compiler
# remove the visibility modifiers, so the mex gateway is visible # remove the visibility modifiers, so the mex gateway is visible
...@@ -131,7 +131,7 @@ if (NOT MEX_WORKS) ...@@ -131,7 +131,7 @@ if (NOT MEX_WORKS)
${CMAKE_CURRENT_SOURCE_DIR}/generator/gen_matlab.py ${CMAKE_CURRENT_SOURCE_DIR}/generator/gen_matlab.py
--hdrparser ${HDR_PARSER_PATH} --hdrparser ${HDR_PARSER_PATH}
--rstparser ${RST_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 --outdir ${CMAKE_BINARY_DIR}/junk
ERROR_VARIABLE GEN_ERROR ERROR_VARIABLE GEN_ERROR
OUTPUT_QUIET OUTPUT_QUIET
......
...@@ -27,8 +27,8 @@ class MatlabWrapperGenerator(object): ...@@ -27,8 +27,8 @@ class MatlabWrapperGenerator(object):
rst.definitions = {} rst.definitions = {}
for extra in extras: for extra in extras:
module = extra.split(":")[0] module = extra.split("=")[0]
header = extra.split(":")[1] header = extra.split("=")[1]
ns[module] = ns[module] + parser.parse(header) if module in ns else parser.parse(header) ns[module] = ns[module] + parser.parse(header) if module in ns else parser.parse(header)
# cleanify the parser output # cleanify the parser output
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment