potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-31 08:13:04 +04:00
Code Packages Releases Wiki Activity

Merge branch 4.x

Browse Source
This commit is contained in:
Alexander Alekhin
2021-12-30 16:23:27 +00:00
parent 80c5d18f9c 5f249a3e67
commit a0d5277e0d
951 changed files with 158314 additions and 152668 deletions
Download Patch File Download Diff File Expand all files Collapse all files
samples/install/linux_install_a.sh
+2 -2
View File
@@ -26,9 +26,9 @@ sudo apt install -y wget unzip
# [wget]
# [download]
wget -O opencv.zip https://github.com/opencv/opencv/archive/master.zip
wget -O opencv.zip https://github.com/opencv/opencv/archive/5.x.zip
unzip opencv.zip
mv opencv-master opencv
mv opencv-5.x opencv
# [download]
# [prepare]
samples/install/linux_install_b.sh
+1 -1
View File
@@ -27,7 +27,7 @@ sudo apt install -y git
# [download]
git clone https://github.com/opencv/opencv.git
git -C opencv checkout master
git -C opencv checkout 5.x
# [download]
# [prepare]
samples/install/linux_quick_install.sh
+2 -2
View File
@@ -12,14 +12,14 @@ fi
sudo apt update && sudo apt install -y cmake g++ wget unzip
# Download and unpack sources
wget -O opencv.zip https://github.com/opencv/opencv/archive/master.zip
wget -O opencv.zip https://github.com/opencv/opencv/archive/5.x.zip
unzip opencv.zip
# Create build directory
mkdir -p build && cd build
# Configure
cmake ../opencv-master
cmake ../opencv-5.x
# Build
cmake --build .
samples/install/linux_quick_install_contrib.sh
+3 -3
View File
@@ -12,8 +12,8 @@ fi
sudo apt update && sudo apt install -y cmake g++ wget unzip
# Download and unpack sources
wget -O opencv.zip https://github.com/opencv/opencv/archive/master.zip
wget -O opencv_contrib.zip https://github.com/opencv/opencv_contrib/archive/master.zip
wget -O opencv.zip https://github.com/opencv/opencv/archive/5.x.zip
wget -O opencv_contrib.zip https://github.com/opencv/opencv_contrib/archive/5.x.zip
unzip opencv.zip
unzip opencv_contrib.zip
@@ -21,7 +21,7 @@ unzip opencv_contrib.zip
mkdir -p build && cd build
# Configure
cmake -DOPENCV_EXTRA_MODULES_PATH=../opencv_contrib-master/modules ../opencv-master
cmake -DOPENCV_EXTRA_MODULES_PATH=../opencv_contrib-5.x/modules ../opencv-5.x
# Build
cmake --build .