@@ -76,7 +76,7 @@ def main():
76
76
# Path regexes with forward slashes relative to CMake install dir.
77
77
rearrange_cmake_output_data = {
78
78
79
- 'cv2' : ([r'bin/opencv_ffmpeg \d{3}%s\.dll' % ('_64' if x64 else '' )] if os .name == 'nt' else []) +
79
+ 'cv2' : ([r'bin/opencv_videoio_ffmpeg \d{3}%s\.dll' % ('_64' if x64 else '' )] if os .name == 'nt' else []) +
80
80
# In Windows, in python/X.Y/<arch>/; in Linux, in just python/X.Y/.
81
81
# Naming conventions vary so widely between versions and OSes
82
82
# had to give up on checking them.
@@ -102,7 +102,7 @@ def main():
102
102
# skbuild inserts PYTHON_* vars. That doesn't satisfy opencv build scripts in case of Py3
103
103
"-DPYTHON%d_EXECUTABLE=%s" % (sys .version_info [0 ], sys .executable ),
104
104
"-DBUILD_opencv_python%d=ON" % sys .version_info [0 ],
105
-
105
+
106
106
# When off, adds __init__.py and a few more helper .py's. We use our own helper files with a different structure.
107
107
"-DOPENCV_SKIP_PYTHON_LOADER=ON" ,
108
108
# Relative dir to install the built module to in the build tree.
@@ -111,7 +111,7 @@ def main():
111
111
# Otherwise, opencv scripts would want to install `.pyd' right into site-packages,
112
112
# and skbuild bails out on seeing that
113
113
"-DINSTALL_CREATE_DISTRIB=ON" ,
114
-
114
+
115
115
# See opencv/CMakeLists.txt for options and defaults
116
116
"-DBUILD_opencv_apps=OFF" ,
117
117
"-DBUILD_SHARED_LIBS=OFF" ,
@@ -147,12 +147,12 @@ def main():
147
147
if sys .platform .startswith ('linux' ) and not x64 :
148
148
cmake_args .append ("-DCMAKE_CXX_FLAGS=-U__STRICT_ANSI__" )
149
149
150
-
150
+
151
151
if 'CMAKE_ARGS' in os .environ :
152
152
import shlex
153
153
cmake_args .extend (shlex .split (os .environ ['CMAKE_ARGS' ]))
154
154
del shlex
155
-
155
+
156
156
# ABI config variables are introduced in PEP 425
157
157
if sys .version_info [:2 ] < (3 , 2 ):
158
158
import warnings
0 commit comments