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
bf80c941
Commit
bf80c941
authored
Jan 02, 2018
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #10481 from alalek:fix_10474
parents
22576f4d
ea5a3e55
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
1 deletion
+17
-1
OpenCVUtils.cmake
cmake/OpenCVUtils.cmake
+15
-0
CMakeLists.txt
modules/python/bindings/CMakeLists.txt
+2
-1
No files found.
cmake/OpenCVUtils.cmake
View file @
bf80c941
...
...
@@ -667,6 +667,21 @@ macro(ocv_list_filterout lst regex)
endforeach
()
endmacro
()
# filter matching elements from the list
macro
(
ocv_list_filter lst regex
)
set
(
dst
${
ARGN
}
)
if
(
NOT dst
)
set
(
dst
${
lst
}
)
endif
()
set
(
__result
${${
lst
}}
)
foreach
(
item
${
__result
}
)
if
(
NOT item MATCHES
"
${
regex
}
"
)
list
(
REMOVE_ITEM __result
"
${
item
}
"
)
endif
()
endforeach
()
set
(
${
dst
}
${
__result
}
)
endmacro
()
# stable & safe duplicates removal macro
macro
(
ocv_list_unique __lst
)
...
...
modules/python/bindings/CMakeLists.txt
View file @
bf80c941
...
...
@@ -20,7 +20,8 @@ endforeach()
set
(
opencv_hdrs
""
)
set
(
opencv_userdef_hdrs
""
)
foreach
(
m
${
OPENCV_PYTHON_MODULES
}
)
list
(
APPEND opencv_hdrs
${
OPENCV_MODULE_
${
m
}
_HEADERS
}
)
ocv_list_filter
(
OPENCV_MODULE_
${
m
}
_HEADERS
"
${
OPENCV_MODULE_
${
m
}
_LOCATION
}
/include"
__hdrs
)
list
(
APPEND opencv_hdrs
${
__hdrs
}
)
file
(
GLOB userdef_hdrs
${
OPENCV_MODULE_
${
m
}
_LOCATION
}
/misc/python/pyopencv*.hpp
)
list
(
APPEND opencv_userdef_hdrs
${
userdef_hdrs
}
)
endforeach
(
m
)
...
...
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