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

build: transition to C++17, minor changes in documentation

Browse Source
This commit is contained in:
Maksim Shabunin
2024-10-10 18:28:43 +03:00
parent 8e55659afe
commit d223e796f5
14 changed files with 73 additions and 330 deletions
Download Patch File Download Diff File Expand all files Collapse all files
samples/install/linux_quick_install.sh
+2 -2
View File
@@ -9,7 +9,7 @@ fi
# [body]
# Install minimal prerequisites (Ubuntu 18.04 as reference)
sudo apt update && sudo apt install -y cmake g++ wget unzip
sudo apt update && sudo apt install -y cmake g++ wget unzip ninja-build
# Download and unpack sources
wget -O opencv.zip https://github.com/opencv/opencv/archive/5.x.zip
@@ -19,7 +19,7 @@ unzip opencv.zip
mkdir -p build && cd build
# Configure
cmake ../opencv-5.x
cmake -GNinja ../opencv-5.x
# Build
cmake --build .
samples/install/linux_quick_install_contrib.sh
+2 -2
View File
@@ -9,7 +9,7 @@ fi
# [body]
# Install minimal prerequisites (Ubuntu 18.04 as reference)
sudo apt update && sudo apt install -y cmake g++ wget unzip
sudo apt update && sudo apt install -y cmake g++ wget unzip ninja-build
# Download and unpack sources
wget -O opencv.zip https://github.com/opencv/opencv/archive/5.x.zip
@@ -21,7 +21,7 @@ unzip opencv_contrib.zip
mkdir -p build && cd build
# Configure
cmake -DOPENCV_EXTRA_MODULES_PATH=../opencv_contrib-5.x/modules ../opencv-5.x
cmake -GNinja -DOPENCV_EXTRA_MODULES_PATH=../opencv_contrib-5.x/modules ../opencv-5.x
# Build
cmake --build .
samples/install/linux_verify.sh
+14 -8
View File
@@ -1,18 +1,24 @@
#!/bin/bash
# This script verifies that all shell snippets in the
# Linux installation tutorial work (in Ubuntu 18 container)
# Linux installation tutorial work (in Ubuntu 20 container)
set -e
set -x
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
docker pull ubuntu:18.04
containers=(ubuntu:20.04 debian:10)
scripts=$(cd "${SCRIPT_DIR}" && ls -1 linux_*install*.sh)
for f in $(cd "${SCRIPT_DIR}" && ls -1 linux_*install*.sh) ; do
echo "Checking $f..."
docker run -it \
--volume "${SCRIPT_DIR}":/install:ro \
ubuntu:18.04 \
/bin/bash -ex /install/$f --check
docker pull debian:10
for cnt in $containers ; do
docker pull ${cnt}
for f in $scripts ; do
echo "Checking ${f} @ ${cnt}..."
docker run -it \
-e DEBIAN_FRONTEND=noninteractive \
--volume "${SCRIPT_DIR}":/install:ro \
${cnt} \
/bin/bash -ex /install/${f} --check
done
done