File tree Expand file tree Collapse file tree 1 file changed +2
-1
lines changed
Filter options
Expand file tree Collapse file tree 1 file changed +2
-1
lines changed
Original file line number Diff line number Diff line change @@ -7,6 +7,7 @@ export PYTHON_VERSION=${PYTHON_VERSION/./}
7
7
echo ' PYTHON_VERSION: ' $PYTHON_VERSION
8
8
9
9
ENABLE_CONTRIB=$( < contrib.enabled)
10
+ ninja_path=$( readlink -f ninja)
10
11
11
12
source travis/install-ninja.sh
12
13
@@ -48,7 +49,7 @@ for PYBIN in /opt/python/cp$PYTHON_VERSION*/bin; do
48
49
49
50
if [[ $PYTHON_VERSION == 2* ]] && [[ $ENABLE_CONTRIB == 1 ]]; then
50
51
echo ' Config for Py2'
51
- cmake28 -H" ." -B" build" -GNinja -DOPENCV_EXTRA_MODULES_PATH=../opencv_contrib/modules -DCMAKE_BUILD_TYPE=Release -DBUILD_opencv_python3=OFF -DBUILD_opencv_java=OFF -DBUILD_SHARED_LIBS=OFF \
52
+ cmake28 -H" ." -B" build" -D " CMAKE_MAKE_PROGRAM:PATH= $ninja_path " - GNinja -DOPENCV_EXTRA_MODULES_PATH=../opencv_contrib/modules -DCMAKE_BUILD_TYPE=Release -DBUILD_opencv_python3=OFF -DBUILD_opencv_java=OFF -DBUILD_SHARED_LIBS=OFF \
52
53
-DBUILD_TESTS=OFF -DBUILD_PERF_TESTS=OFF -DWITH_IPP=OFF -DBUILD_DOCS=OFF \
53
54
-DPYTHON2INTERP_FOUND=ON -DPYTHON2LIBS_FOUND=ON \
54
55
-DPYTHON2_EXECUTABLE=$PYBIN /python \
You can’t perform that action at this time.
0 commit comments