Skip to content

Commit b8de9e1

Browse files
authored
Merge pull request #24 from mottelet/tune_build
Tune build
2 parents a444d70 + 8fb8301 commit b8de9e1

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

thirdparty/build/build.bat

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,20 @@
55
:: version 2.1 of the License, or (at your option) any later version.
66
::
77
:: openCV build script for Windows
8-
:: cmake.exe (standalone or Visual Studio cmake.exe) should be in the PATH
8+
:: cmake.exe (standalone or Visual Studio cmake.exe) and ninja.exe should be in the PATH
99

1010
set OPENCV_VER=4.5.0
1111
curl -o opencv.tgz https://codeload.github.com/opencv/opencv/tar.gz/refs/tags/%OPENCV_VER%
1212
curl -o opencv_contrib.tgz https://codeload.github.com/opencv/opencv_contrib/tar.gz/refs/tags/%OPENCV_VER%
13-
tar xvzf opencv.tgz
14-
tar xvzf opencv_contrib.tgz
13+
tar -xf opencv.tgz
14+
tar -xf opencv_contrib.tgz
1515
cd ..
1616
set THIRDPARTY=%cd%
1717
set PREFIX=%THIRDPARTY%\Windows\%PROCESSOR_ARCHITECTURE%
1818
cd build\opencv-%OPENCV_VER%
1919
mkdir build
2020
cd build
21-
cmake -DCMAKE_INSTALL_PREFIX="%PREFIX%" ^
21+
cmake -G Ninja -DCMAKE_INSTALL_PREFIX="%PREFIX%" ^
2222
-DCMAKE_BUILD_TYPE=Release ^
2323
-DWITH_VTK=OFF ^
2424
-DOPENCV_EXTRA_MODULES_PATH="%THIRDPARTY%\build\opencv_contrib-%OPENCV_VER%\modules" ^

thirdparty/build/build.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# version 2.1 of the License, or (at your option) any later version.
77
#
88
# openCV build script for Linux and macOS
9-
# cmake should be in the PATH
9+
# cmake and ninja should be in the PATH
1010

1111
THIRDPARTY="$(cd ..; pwd)"
1212
PREFIX="${THIRDPARTY}/$(uname -s)/$(uname -m)"
@@ -15,7 +15,7 @@ FFMPEG_VER=4.3.6
1515

1616
# ffmpeg build
1717
[ ! -f opencv-${OPENCV_VER}.tar.gz ] && curl -LO https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VER}.tar.gz
18-
tar xvzf ffmpeg-${FFMPEG_VER}.tar.gz
18+
tar -xf ffmpeg-${FFMPEG_VER}.tar.gz
1919
cd ffmpeg-${FFMPEG_VER}
2020
./configure --enable-shared --enable-rpath --disable-static --disable-programs --disable-x86asm --prefix="${PREFIX}"
2121
make -j4
@@ -25,14 +25,14 @@ cd ..
2525
# opencv build
2626
[ ! -f opencv-${OPENCV_VER}.tar.gz ] && curl -L https://github.com/opencv/opencv/archive/refs/tags/${OPENCV_VER}.tar.gz -o opencv-${OPENCV_VER}.tar.gz
2727
[ ! -f opencv_contrib-${OPENCV_VER}.tar.gz ] && curl -L https://github.com/opencv/opencv_contrib/archive/refs/tags/${OPENCV_VER}.tar.gz -o opencv_contrib-${OPENCV_VER}.tar.gz
28-
tar xvzf opencv-${OPENCV_VER}.tar.gz
29-
tar xvzf opencv_contrib-${OPENCV_VER}.tar.gz
28+
tar -xf opencv-${OPENCV_VER}.tar.gz
29+
tar -xf opencv_contrib-${OPENCV_VER}.tar.gz
3030
cd opencv-${OPENCV_VER}
3131
rm -rf build
3232
mkdir -p build
3333
cd build
3434
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${PREFIX}/lib/pkgconfig"
35-
cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" \
35+
cmake -G Ninja -DCMAKE_INSTALL_PREFIX="${PREFIX}" \
3636
-DCMAKE_BUILD_TYPE=Release \
3737
-DWITH_VTK=OFF \
3838
-DCMAKE_MACOSX_RPATH=ON \

0 commit comments

Comments
 (0)