Merge branch 'main' of github.com:ncsurobotics/SW8S-OpenCVBuild

Author: MB3hel

README.md

@@ -94,7 +94,8 @@ TODO
     - [GStreamer](https://gstreamer.freedesktop.org/download/): Use the "MSVC development installer" and perform a "complete install"
     - [OpenJDK 11](https://adoptium.net/): Make sure `JAVA_HOME` is set to the directory java is installed in (not the bin, the root directory). Alternatively, you can make sure the desired java is in your `PATH`.
     - [Apache ANT](https://ant.apache.org/bindownload.cgi): Make sure `ant` is in your path
-    - [Python 3.8](https://www.python.org/): Make sure `python` or `python3` command is in your `PATH`. Make sure the version you want to use is in the path first (shown first by `where.exe python`)
+    - [Python 3.8](https://www.python.org/): Make sure the desired python is the first item in your path and is named `python3` not `python` (just rename the exe file).
+    - NumPy (`python3 -m pip install numpy`)
 - Note that the build script requires Windows 10 17063 or later which includes curl and bsdtar
 - Run the build
     ```sh

windows-amd64-pc/buildopencv.cmd

@@ -38,22 +38,28 @@ cmake -D OPENCV_EXTRA_MODULES_PATH=../opencv_contrib-%VERSION%/modules ^
     -D ENABLE_FAST_MATH=ON ^
     -D CUDA_FAST_MATH=%CUDA% ^
     -D WITH_CUBLAS=%CUDA% ^
-    -D WITH_LIBV4L=ON ^
-    -D WITH_V4L=ON ^
     -D WITH_GSTREAMER=ON ^
     -D WITH_GSTREAMER_0_10=OFF ^
     -D WITH_FFMPEG=ON ^
     -D WITH_QT=OFF ^
     -D WITH_OPENGL=OFF ^
     -D BUILD_opencv_python2=%PYTHON2% ^
     -D BUILD_opencv_python3=%PYTHON3% ^
+    -D OPENCV_PYTHON_INSTALL_PATH=lib/python3.8/site-packages ^
     -D BUILD_TESTS=OFF ^
     -D BUILD_PERF_TESTS=OFF ^
-    -D OPENCV_VCSVERSION=$VERSION ^
-    -D CPACK_PACKAGING_INSTALL_PREFIX=C:\opencv-%VERSION%\ ^
+    -D OPENCV_VCSVERSION=%VERSION% ^
+    -DINSTALL_CREATE_DISTRIB=ON ^
+    -DCMAKE_INSTALL_PREFIX=c:/opencv-%VERSION%/ ^
+    -DCPACK_NSIS_INSTALL_ROOT=c:\\opencv-%VERSION% ^
+    -DCPACK_PACKAGE_INSTALL_DIRECTORY= ^
+    -DCPACK_NSIS_PACKAGE_NAME="OpenCV %VERSION%" ^
+    -DPYTHON_DEFAULT_AVAILABLE=ON ^
+    -DBUILD_opencv_world=OFF ^
     ../opencv-%VERSION%
+
 cmake --build . --config Release
 
 
 :: Package
-cmake --build . --target package
+cmake --build . --config Release --target package