reset to old behaviour

skvark · skvark · commit 5111fa415f70 · 2018-12-27T18:16:38.000+02:00
diff --git a/setup.py b/setup.py
@@ -83,7 +83,7 @@ def main():
         ['python/([^/]+/){1,2}cv2[^/]*%(ext)s' % {'ext': re.escape(sysconfig.get_config_var('SO'))}],
 
         'cv2.data': [  # OPENCV_OTHER_INSTALL_PATH
-            ('etc' if os.name == 'nt' else 'share/opencv4') +
+            ('etc' if os.name == 'nt' else 'share/OpenCV') +
             r'/haarcascades/.*\.xml'
         ]
     }
@@ -110,8 +110,7 @@ def main():
         "-DBUILD_SHARED_LIBS=OFF",
         "-DBUILD_TESTS=OFF",
         "-DBUILD_PERF_TESTS=OFF",
-        "-DBUILD_DOCS=OFF",
-        "-DOPENCV_SKIP_PYTHON_LOADER=ON"
+        "-DBUILD_DOCS=OFF"
     ] + (["-DOPENCV_EXTRA_MODULES_PATH=" + os.path.abspath("opencv_contrib/modules")] if build_contrib else [])
 
     # OS-specific components
@@ -124,6 +123,7 @@ def main():
         cmake_args.append("-DWITH_QT=OFF")
 
     if sys.platform.startswith('linux'):
+        cmake_args.append("-DOPENCV_SKIP_PYTHON_LOADER=ON")
         cmake_args.append("-DWITH_V4L=ON")
         cmake_args.append("-DENABLE_PRECOMPILED_HEADERS=OFF")
 
