Skip to content

Commit 8ca2cf8

Browse files
skvarkskvark
committed
unify and clean up Linux and macOS build scripts, detect python paths
automatically on macOS
1 parent bbde21c commit 8ca2cf8

File tree

3 files changed

+126
-111
lines changed

3 files changed

+126
-111
lines changed

‎.travis.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,51 +31,51 @@ matrix:
3131
# default builds for MacOS
3232
- os: osx
3333
language: generic
34-
osx_image: xcode8.2
34+
osx_image: xcode8.3
3535
env:
3636
- MB_PYTHON_VERSION=2.7
3737
- ENABLE_CONTRIB=0
3838
- os: osx
3939
language: generic
40-
osx_image: xcode8.2
40+
osx_image: xcode8.3
4141
env:
4242
- MB_PYTHON_VERSION=3.4
4343
- ENABLE_CONTRIB=0
4444
- os: osx
4545
language: generic
46-
osx_image: xcode8.2
46+
osx_image: xcode8.3
4747
env:
4848
- MB_PYTHON_VERSION=3.5
4949
- ENABLE_CONTRIB=0
5050
- os: osx
5151
language: generic
52-
osx_image: xcode8.2
52+
osx_image: xcode8.3
5353
env:
5454
- MB_PYTHON_VERSION=3.6
5555
- ENABLE_CONTRIB=0
5656

5757
# Contrib builds for MacOS
5858
- os: osx
5959
language: generic
60-
osx_image: xcode8.2
60+
osx_image: xcode8.3
6161
env:
6262
- MB_PYTHON_VERSION=2.7
6363
- ENABLE_CONTRIB=1
6464
- os: osx
6565
language: generic
66-
osx_image: xcode8.2
66+
osx_image: xcode8.3
6767
env:
6868
- MB_PYTHON_VERSION=3.4
6969
- ENABLE_CONTRIB=1
7070
- os: osx
7171
language: generic
72-
osx_image: xcode8.2
72+
osx_image: xcode8.3
7373
env:
7474
- MB_PYTHON_VERSION=3.5
7575
- ENABLE_CONTRIB=1
7676
- os: osx
7777
language: generic
78-
osx_image: xcode8.2
78+
osx_image: xcode8.3
7979
env:
8080
- MB_PYTHON_VERSION=3.6
8181
- ENABLE_CONTRIB=1

‎travis/build-wheels-osx.sh

Lines changed: 63 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ echo 'Begin build-wheel OSX ...'
44

55
export PYTHON_VERSION=${MB_PYTHON_VERSION/./}
66
echo 'MB_PYTHON_VERSION: ' $MB_PYTHON_VERSION
7-
echo 'PYTHON_VERSION: '$PYTHON_VERSION
7+
echo 'PYTHON_VERSION: ' $PYTHON_VERSION
88

99
echo 'PIP and brew installs'
1010

@@ -16,6 +16,20 @@ echo "Apply patch"
1616

1717
git apply --ignore-space-change --ignore-whitespace ../travis/disable_i386.patch
1818

19+
echo "Detect Python paths for OpenCV"
20+
21+
PYTHON_VERSION_STRING = $(python -c "from platform import python_version; print(python_version())")
22+
PYTHON_INCLUDE_PATH = $(python -c "from distutils.sysconfig import get_python_inc; print(get_python_inc())")
23+
PYTHON_PACKAGES_PATH = $(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")
24+
PYTHON_NUMPY_INCLUDE_DIRS = $(python -c "import os; os.environ['DISTUTILS_USE_SDK']='1'; import numpy.distutils; print(os.pathsep.join(numpy.distutils.misc_util.get_numpy_include_dirs()))")
25+
PYTHON_NUMPY_VERSION = $(python -c "import numpy; print(numpy.version.version)")
26+
27+
echo "PYthon version string: $PYTHON_VERSION_STRING"
28+
echo "Python include path: $PYTHON_INCLUDE_PATH"
29+
echo "Python packages path: $PYTHON_PACKAGES_PATH"
30+
echo "Python numpy incude dirs: $PYTHON_NUMPY_INCLUDE_DIRS"
31+
echo "Python numpy version: $PYTHON_NUMPY_VERSION"
32+
1933
echo 'Config make'
2034

2135
mkdir build
@@ -25,94 +39,77 @@ if [[ $PYTHON_VERSION == 2* ]] && [[ $ENABLE_CONTRIB == 0 ]]; then
2539
echo 'Config for Py2'
2640
cmake -D CMAKE_BUILD_TYPE=RELEASE -D CMAKE_INSTALL_PREFIX=/usr/local -D CMAKE_TOOLCHAIN_FILE=../../travis/toolchain_macos.cmake \
2741
-D BUILD_opencv_python3=OFF -D BUILD_opencv_java=OFF -D BUILD_SHARED_LIBS=OFF -D WITH_LAPACK=OFF \
28-
-D PYTHON2_PACKAGES_PATH=$(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())") \
29-
-D PYTHON2_LIBRARY=/usr/local/Cellar/python/2.7.10/Frameworks/Python.framework/Versions/2.7/bin \
30-
-D PYTHON2_INCLUDE_DIR=/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7 \
31-
-D INSTALL_C_EXAMPLES=OFF -D INSTALL_PYTHON_EXAMPLES=OFF -D BUILD_TESTS=OFF -D BUILD_PERF_TESTS=OFF \
32-
-D BUILD_EXAMPLES=OFF ..
33-
fi
34-
35-
if [[ $PYTHON_VERSION == 34 ]] && [[ $ENABLE_CONTRIB == 0 ]]; then
36-
echo 'Config for Py34'
37-
cmake -D CMAKE_BUILD_TYPE=RELEASE -D CMAKE_INSTALL_PREFIX=/usr/local -D CMAKE_TOOLCHAIN_FILE=../../travis/toolchain_macos.cmake \
38-
-D BUILD_opencv_python2=OFF -D BUILD_opencv_java=OFF -D BUILD_SHARED_LIBS=OFF -D WITH_LAPACK=OFF \
39-
-D PYTHON3_PACKAGES_PATH=$(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())") \
40-
-D PYTHON3_LIBRARY=/usr/local/Cellar/python3/3.4.2_1/Frameworks/Python.framework/Versions/3.4/bin \
41-
-D PYTHON3_INCLUDE_DIR=/Library/Frameworks/Python.framework/Versions/3.4/include/python3.4m \
4242
-D INSTALL_C_EXAMPLES=OFF -D INSTALL_PYTHON_EXAMPLES=OFF -D BUILD_TESTS=OFF -D BUILD_PERF_TESTS=OFF \
43-
-D BUILD_EXAMPLES=OFF ..
43+
-D BUILD_EXAMPLES=OFF \
44+
-D PYTHON2INTERP_FOUND=ON -DPYTHON2LIBS_FOUND=ON \
45+
-D PYTHON2_EXECUTABLE=python \
46+
-D PYTHON2_VERSION_STRING=$PYTHON_VERSION_STRING \
47+
-D PYTHON2_INCLUDE_PATH=$PYTHON_INCLUDE_PATH \
48+
-D PYTHON2_PACKAGES_PATH=$PYTHON_PACKAGES_PATH \
49+
-D PYTHON2_NUMPY_INCLUDE_DIRS=$PYTHON_NUMPY_INCLUDE_DIRS \
50+
-D PYTHON2_NUMPY_VERSION=$PYTHON_NUMPY_VERSION \
51+
..
4452
fi
4553

46-
if [[ $PYTHON_VERSION == 35 ]] && [[ $ENABLE_CONTRIB == 0 ]]; then
47-
echo 'Config for Py35'
54+
if [[ $PYTHON_VERSION == 3* ]] && [[ $ENABLE_CONTRIB == 0 ]]; then
55+
echo 'Config for Py3'
4856
cmake -D CMAKE_BUILD_TYPE=RELEASE -D CMAKE_INSTALL_PREFIX=/usr/local -D CMAKE_TOOLCHAIN_FILE=../../travis/toolchain_macos.cmake \
4957
-D BUILD_opencv_python2=OFF -D BUILD_opencv_java=OFF -D BUILD_SHARED_LIBS=OFF -D WITH_LAPACK=OFF \
50-
-D PYTHON3_PACKAGES_PATH=$(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())") \
51-
-D PYTHON3_LIBRARY=/usr/local/Cellar/python3/3.5.1/Frameworks/Python.framework/Versions/3.5/bin \
52-
-D PYTHON3_INCLUDE_DIR=/Library/Frameworks/Python.framework/Versions/3.5/include/python3.5m \
5358
-D INSTALL_C_EXAMPLES=OFF -D INSTALL_PYTHON_EXAMPLES=OFF -D BUILD_TESTS=OFF -D BUILD_PERF_TESTS=OFF \
54-
-D BUILD_EXAMPLES=OFF ..
59+
-D BUILD_EXAMPLES=OFF \
60+
-D PYTHON3INTERP_FOUND=ON -DPYTHON3LIBS_FOUND=ON \
61+
-D PYTHON3_EXECUTABLE=python \
62+
-D PYTHON3_VERSION_STRING=$PYTHON_VERSION_STRING \
63+
-D PYTHON3_INCLUDE_PATH=$PYTHON_INCLUDE_PATH \
64+
-D PYTHON3_PACKAGES_PATH=$PYTHON_PACKAGES_PATH \
65+
-D PYTHON3_NUMPY_INCLUDE_DIRS=$PYTHON_NUMPY_INCLUDE_DIRS \
66+
-D PYTHON3_NUMPY_VERSION=$PYTHON_NUMPY_VERSION \
67+
..
5568
fi
5669

57-
if [[ $PYTHON_VERSION == 36 ]] && [[ $ENABLE_CONTRIB == 0 ]]; then
58-
echo 'Config for Py36'
59-
cmake -D CMAKE_BUILD_TYPE=RELEASE -D CMAKE_INSTALL_PREFIX=/usr/local -D CMAKE_TOOLCHAIN_FILE=../../travis/toolchain_macos.cmake \
60-
-D BUILD_opencv_python2=OFF -D BUILD_opencv_java=OFF -D BUILD_SHARED_LIBS=OFF -D WITH_LAPACK=OFF \
61-
-D PYTHON3_PACKAGES_PATH=$(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())") \
62-
-D PYTHON3_LIBRARY=/usr/local/Cellar/python3/3.6.0/Frameworks/Python.framework/Versions/3.6/bin \
63-
-D PYTHON3_INCLUDE_DIR=/Library/Frameworks/Python.framework/Versions/3.6/include/python3.6m \
64-
-D INSTALL_C_EXAMPLES=OFF -D INSTALL_PYTHON_EXAMPLES=OFF -D BUILD_TESTS=OFF -D BUILD_PERF_TESTS=OFF \
65-
-D BUILD_EXAMPLES=OFF ..
66-
fi
67-
68-
6970
if [[ $PYTHON_VERSION == 2* ]] && [[ $ENABLE_CONTRIB == 1 ]]; then
7071
echo 'Config for Py2'
7172
cmake -D CMAKE_BUILD_TYPE=RELEASE -D CMAKE_INSTALL_PREFIX=/usr/local -D CMAKE_TOOLCHAIN_FILE=../../travis/toolchain_macos.cmake -DOPENCV_EXTRA_MODULES_PATH=../../opencv_contrib/modules \
7273
-D BUILD_opencv_python3=OFF -D BUILD_opencv_java=OFF -D BUILD_SHARED_LIBS=OFF -D WITH_LAPACK=OFF \
73-
-D PYTHON2_PACKAGES_PATH=$(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())") \
74-
-D PYTHON2_LIBRARY=/usr/local/Cellar/python/2.7.10/Frameworks/Python.framework/Versions/2.7/bin \
75-
-D PYTHON2_INCLUDE_DIR=/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7 \
7674
-D INSTALL_C_EXAMPLES=OFF -D INSTALL_PYTHON_EXAMPLES=OFF -D BUILD_TESTS=OFF -D BUILD_PERF_TESTS=OFF \
77-
-D BUILD_EXAMPLES=OFF ..
75+
-D BUILD_EXAMPLES=OFF \
76+
-D PYTHON2INTERP_FOUND=ON -DPYTHON2LIBS_FOUND=ON \
77+
-D PYTHON2_EXECUTABLE=python \
78+
-D PYTHON2_VERSION_STRING=$PYTHON_VERSION_STRING \
79+
-D PYTHON2_INCLUDE_PATH=$PYTHON_INCLUDE_PATH \
80+
-D PYTHON2_PACKAGES_PATH=$PYTHON_PACKAGES_PATH \
81+
-D PYTHON2_NUMPY_INCLUDE_DIRS=$PYTHON_NUMPY_INCLUDE_DIRS \
82+
-D PYTHON2_NUMPY_VERSION=$PYTHON_NUMPY_VERSION \
83+
..
7884
fi
7985

80-
if [[ $PYTHON_VERSION == 34 ]] && [[ $ENABLE_CONTRIB == 1 ]]; then
81-
echo 'Config for Py34'
86+
if [[ $PYTHON_VERSION == 3* ]] && [[ $ENABLE_CONTRIB == 1 ]]; then
87+
echo 'Config for Py3'
8288
cmake -D CMAKE_BUILD_TYPE=RELEASE -D CMAKE_INSTALL_PREFIX=/usr/local -D CMAKE_TOOLCHAIN_FILE=../../travis/toolchain_macos.cmake -DOPENCV_EXTRA_MODULES_PATH=../../opencv_contrib/modules \
8389
-D BUILD_opencv_python2=OFF -D BUILD_opencv_java=OFF -D BUILD_SHARED_LIBS=OFF -D WITH_LAPACK=OFF \
84-
-D PYTHON3_PACKAGES_PATH=$(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())") \
85-
-D PYTHON3_LIBRARY=/usr/local/Cellar/python3/3.4.2_1/Frameworks/Python.framework/Versions/3.4/bin \
86-
-D PYTHON3_INCLUDE_DIR=/Library/Frameworks/Python.framework/Versions/3.4/include/python3.4m \
8790
-D INSTALL_C_EXAMPLES=OFF -D INSTALL_PYTHON_EXAMPLES=OFF -D BUILD_TESTS=OFF -D BUILD_PERF_TESTS=OFF \
88-
-D BUILD_EXAMPLES=OFF ..
91+
-D BUILD_EXAMPLES=OFF \
92+
-D PYTHON3INTERP_FOUND=ON -DPYTHON3LIBS_FOUND=ON \
93+
-D PYTHON3_EXECUTABLE=python \
94+
-D PYTHON3_VERSION_STRING=$PYTHON_VERSION_STRING \
95+
-D PYTHON3_INCLUDE_PATH=$PYTHON_INCLUDE_PATH \
96+
-D PYTHON3_PACKAGES_PATH=$PYTHON_PACKAGES_PATH \
97+
-D PYTHON3_NUMPY_INCLUDE_DIRS=$PYTHON_NUMPY_INCLUDE_DIRS \
98+
-D PYTHON3_NUMPY_VERSION=$PYTHON_NUMPY_VERSION \
99+
..
89100
fi
90101

91-
if [[ $PYTHON_VERSION == 35 ]] && [[ $ENABLE_CONTRIB == 1 ]]; then
92-
echo 'Config for Py35'
93-
cmake -D CMAKE_BUILD_TYPE=RELEASE -D CMAKE_INSTALL_PREFIX=/usr/local -D CMAKE_TOOLCHAIN_FILE=../../travis/toolchain_macos.cmake -DOPENCV_EXTRA_MODULES_PATH=../../opencv_contrib/modules \
94-
-D BUILD_opencv_python2=OFF -D BUILD_opencv_java=OFF -D BUILD_SHARED_LIBS=OFF -D WITH_LAPACK=OFF \
95-
-D PYTHON3_PACKAGES_PATH=$(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())") \
96-
-D PYTHON3_LIBRARY=/usr/local/Cellar/python3/3.5.1/Frameworks/Python.framework/Versions/3.5/bin \
97-
-D PYTHON3_INCLUDE_DIR=/Library/Frameworks/Python.framework/Versions/3.5/include/python3.5m \
98-
-D INSTALL_C_EXAMPLES=OFF -D INSTALL_PYTHON_EXAMPLES=OFF -D BUILD_TESTS=OFF -D BUILD_PERF_TESTS=OFF \
99-
-D BUILD_EXAMPLES=OFF ..
100-
fi
102+
echo 'Begin build'
101103

102-
if [[ $PYTHON_VERSION == 36 ]] && [[ $ENABLE_CONTRIB == 1 ]]; then
103-
echo 'Config for Py36'
104-
cmake -D CMAKE_BUILD_TYPE=RELEASE -D CMAKE_INSTALL_PREFIX=/usr/local -D CMAKE_TOOLCHAIN_FILE=../../travis/toolchain_macos.cmake -DOPENCV_EXTRA_MODULES_PATH=../../opencv_contrib/modules \
105-
-D BUILD_opencv_python2=OFF -D BUILD_opencv_java=OFF -D BUILD_SHARED_LIBS=OFF -D WITH_LAPACK=OFF \
106-
-D PYTHON3_PACKAGES_PATH=$(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())") \
107-
-D PYTHON3_LIBRARY=/usr/local/Cellar/python3/3.6.0/Frameworks/Python.framework/Versions/3.6/bin \
108-
-D PYTHON3_INCLUDE_DIR=/Library/Frameworks/Python.framework/Versions/3.6/include/python3.6m \
109-
-D INSTALL_C_EXAMPLES=OFF -D INSTALL_PYTHON_EXAMPLES=OFF -D BUILD_TESTS=OFF -D BUILD_PERF_TESTS=OFF \
110-
-D BUILD_EXAMPLES=OFF ..
104+
if [[ $PYTHON_VERSION == 2* ]]; then
105+
echo 'Build for Py2'
106+
make -j8 opencv_python2
111107
fi
112108

113-
114-
echo 'Begin build'
115-
make -j8
109+
if [[ $PYTHON_VERSION == 3* ]]; then
110+
echo 'Build for Py3'
111+
make -j8 opencv_python3
112+
fi
116113

117114
# Moving back to opencv-python
118115
cd ../..

‎travis/build-wheels.sh

Lines changed: 55 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ set +e
33
echo 'Begin build-wheel...'
44

55
export PYTHON_VERSION=${PYTHON_VERSION/./}
6-
echo 'PYTHON_VERSION: '$PYTHON_VERSION
6+
echo 'PYTHON_VERSION: ' $PYTHON_VERSION
77

88
ENABLE_CONTRIB=$(<contrib.enabled)
99

@@ -19,6 +19,20 @@ yum -y install curl-devel zlib-devel # need to build against system curl to get
1919
make && make install
2020
cd ..
2121

22+
echo "Detect Python paths for OpenCV"
23+
24+
PYTHON_VERSION_STRING = $(python -c "from platform import python_version; print(python_version())")
25+
PYTHON_INCLUDE_PATH = $(python -c "from distutils.sysconfig import get_python_inc; print(get_python_inc())")
26+
PYTHON_PACKAGES_PATH = $(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")
27+
PYTHON_NUMPY_INCLUDE_DIRS = $(python -c "import os; os.environ['DISTUTILS_USE_SDK']='1'; import numpy.distutils; print(os.pathsep.join(numpy.distutils.misc_util.get_numpy_include_dirs()))")
28+
PYTHON_NUMPY_VERSION = $(python -c "import numpy; print(numpy.version.version)")
29+
30+
echo "PYthon version string: $PYTHON_VERSION_STRING"
31+
echo "Python include path: $PYTHON_INCLUDE_PATH"
32+
echo "Python packages path: $PYTHON_PACKAGES_PATH"
33+
echo "Python numpy incude dirs: $PYTHON_NUMPY_INCLUDE_DIRS"
34+
echo "Python numpy version: $PYTHON_NUMPY_VERSION"
35+
2236
# Begin build
2337
echo 'Begin build'
2438
cd opencv
@@ -27,57 +41,61 @@ mkdir build
2741
if [[ $PYTHON_VERSION == 2* ]] && [[ $ENABLE_CONTRIB == 0 ]]; then
2842
echo 'Config for Py2'
2943
cmake -H"." -B"build" -DCMAKE_BUILD_TYPE=Release -DBUILD_opencv_python3=OFF -DBUILD_opencv_java=OFF -DBUILD_SHARED_LIBS=OFF \
30-
-DBUILD_TESTS=OFF -DBUILD_PERF_TESTS=OFF -DWITH_IPP=OFF -DBUILD_DOCS=OFF \
31-
-DINSTALL_C_EXAMPLES=OFF -DINSTALL_PYTHON_EXAMPLES=OFF \
32-
-DPYTHON2INTERP_FOUND=ON -DPYTHON2LIBS_FOUND=ON \
33-
-DPYTHON2_EXECUTABLE=python \
34-
-DPYTHON2_VERSION_STRING=$(python -c "from platform import python_version; print(python_version())") \
35-
-DPYTHON2_INCLUDE_PATH=$(python -c "from distutils.sysconfig import get_python_inc; print(get_python_inc())") \
36-
-DPYTHON2_PACKAGES_PATH=$(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())") \
37-
-DPYTHON2_NUMPY_INCLUDE_DIRS=$(python -c "import os; os.environ['DISTUTILS_USE_SDK']='1'; import numpy.distutils; print(os.pathsep.join(numpy.distutils.misc_util.get_numpy_include_dirs()))") \
38-
-DPYTHON2_NUMPY_VERSION=$(python -c "import numpy; print(numpy.version.version)")
44+
-D WITH_IPP=OFF -D BUILD_DOCS=OFF \
45+
-D INSTALL_C_EXAMPLES=OFF -D INSTALL_PYTHON_EXAMPLES=OFF -D BUILD_TESTS=OFF -D BUILD_PERF_TESTS=OFF \
46+
-D BUILD_EXAMPLES=OFF \
47+
-D PYTHON2INTERP_FOUND=ON -DPYTHON2LIBS_FOUND=ON \
48+
-D PYTHON2_EXECUTABLE=python \
49+
-D PYTHON2_VERSION_STRING=$PYTHON_VERSION_STRING \
50+
-D PYTHON2_INCLUDE_PATH=$PYTHON_INCLUDE_PATH \
51+
-D PYTHON2_PACKAGES_PATH=$PYTHON_PACKAGES_PATH \
52+
-D PYTHON2_NUMPY_INCLUDE_DIRS=$PYTHON_NUMPY_INCLUDE_DIRS \
53+
-D PYTHON2_NUMPY_VERSION=$PYTHON_NUMPY_VERSION \
3954
fi
4055

4156
if [[ $PYTHON_VERSION == 3* ]] && [[ $ENABLE_CONTRIB == 0 ]]; then
4257
echo 'Config for Py3'
4358
cmake -H"." -B"build" -DCMAKE_BUILD_TYPE=Release -DBUILD_opencv_python2=OFF -DBUILD_opencv_java=OFF -DBUILD_SHARED_LIBS=OFF \
44-
-DBUILD_TESTS=OFF -DBUILD_PERF_TESTS=OFF -DWITH_IPP=OFF -DBUILD_DOCS=OFF \
45-
-DINSTALL_C_EXAMPLES=OFF -DINSTALL_PYTHON_EXAMPLES=OFF \
46-
-DPYTHON3INTERP_FOUND=ON -DPYTHON3LIBS_FOUND=ON \
47-
-DPYTHON3_EXECUTABLE=python \
48-
-DPYTHON3_VERSION_STRING=$(python -c "from platform import python_version; print(python_version())") \
49-
-DPYTHON3_INCLUDE_PATH=$(python -c "from distutils.sysconfig import get_python_inc; print(get_python_inc())") \
50-
-DPYTHON3_PACKAGES_PATH=$(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())") \
51-
-DPYTHON3_NUMPY_INCLUDE_DIRS=$(python -c "import os; os.environ['DISTUTILS_USE_SDK']='1'; import numpy.distutils; print(os.pathsep.join(numpy.distutils.misc_util.get_numpy_include_dirs()))") \
52-
-DPYTHON3_NUMPY_VERSION=$(python -c "import numpy; print(numpy.version.version)")
59+
-D WITH_IPP=OFF -D BUILD_DOCS=OFF \
60+
-D INSTALL_C_EXAMPLES=OFF -D INSTALL_PYTHON_EXAMPLES=OFF -D BUILD_TESTS=OFF -D BUILD_PERF_TESTS=OFF \
61+
-D BUILD_EXAMPLES=OFF \
62+
-D PYTHON3INTERP_FOUND=ON -DPYTHON3LIBS_FOUND=ON \
63+
-D PYTHON3_EXECUTABLE=python \
64+
-D PYTHON3_VERSION_STRING=$PYTHON_VERSION_STRING \
65+
-D PYTHON3_INCLUDE_PATH=$PYTHON_INCLUDE_PATH \
66+
-D PYTHON3_PACKAGES_PATH=$PYTHON_PACKAGES_PATH \
67+
-D PYTHON3_NUMPY_INCLUDE_DIRS=$PYTHON_NUMPY_INCLUDE_DIRS \
68+
-D PYTHON3_NUMPY_VERSION=$PYTHON_NUMPY_VERSION \
5369
fi
5470

5571
if [[ $PYTHON_VERSION == 2* ]] && [[ $ENABLE_CONTRIB == 1 ]]; then
5672
echo 'Config for Py2'
5773
cmake -H"." -B"build" -DOPENCV_EXTRA_MODULES_PATH=../opencv_contrib/modules -DCMAKE_BUILD_TYPE=Release -DBUILD_opencv_python3=OFF -DBUILD_opencv_java=OFF -DBUILD_SHARED_LIBS=OFF \
58-
-DBUILD_TESTS=OFF -DBUILD_PERF_TESTS=OFF -DWITH_IPP=OFF -DBUILD_DOCS=OFF \
59-
-DINSTALL_C_EXAMPLES=OFF -DINSTALL_PYTHON_EXAMPLES=OFF \
60-
-DPYTHON2INTERP_FOUND=ON -DPYTHON2LIBS_FOUND=ON \
61-
-DPYTHON2_EXECUTABLE=python \
62-
-DPYTHON2_VERSION_STRING=$(python -c "from platform import python_version; print(python_version())") \
63-
-DPYTHON2_INCLUDE_PATH=$(python -c "from distutils.sysconfig import get_python_inc; print(get_python_inc())") \
64-
-DPYTHON2_PACKAGES_PATH=$(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())") \
65-
-DPYTHON2_NUMPY_INCLUDE_DIRS=$(python -c "import os; os.environ['DISTUTILS_USE_SDK']='1'; import numpy.distutils; print(os.pathsep.join(numpy.distutils.misc_util.get_numpy_include_dirs()))") \
66-
-DPYTHON2_NUMPY_VERSION=$(python -c "import numpy; print(numpy.version.version)")
74+
-D WITH_IPP=OFF -D BUILD_DOCS=OFF \
75+
-D INSTALL_C_EXAMPLES=OFF -D INSTALL_PYTHON_EXAMPLES=OFF -D BUILD_TESTS=OFF -D BUILD_PERF_TESTS=OFF \
76+
-D BUILD_EXAMPLES=OFF \
77+
-D PYTHON2INTERP_FOUND=ON -DPYTHON2LIBS_FOUND=ON \
78+
-D PYTHON2_EXECUTABLE=python \
79+
-D PYTHON2_VERSION_STRING=$PYTHON_VERSION_STRING \
80+
-D PYTHON2_INCLUDE_PATH=$PYTHON_INCLUDE_PATH \
81+
-D PYTHON2_PACKAGES_PATH=$PYTHON_PACKAGES_PATH \
82+
-D PYTHON2_NUMPY_INCLUDE_DIRS=$PYTHON_NUMPY_INCLUDE_DIRS \
83+
-D PYTHON2_NUMPY_VERSION=$PYTHON_NUMPY_VERSION \
6784
fi
6885

6986
if [[ $PYTHON_VERSION == 3* ]] && [[ $ENABLE_CONTRIB == 1 ]]; then
7087
echo 'Config for Py3'
7188
cmake -H"." -B"build" -DOPENCV_EXTRA_MODULES_PATH=../opencv_contrib/modules -DCMAKE_BUILD_TYPE=Release -DBUILD_opencv_python2=OFF -DBUILD_opencv_java=OFF -DBUILD_SHARED_LIBS=OFF \
72-
-DBUILD_TESTS=OFF -DBUILD_PERF_TESTS=OFF -DWITH_IPP=OFF -DBUILD_DOCS=OFF \
73-
-DINSTALL_C_EXAMPLES=OFF -DINSTALL_PYTHON_EXAMPLES=OFF \
74-
-DPYTHON3INTERP_FOUND=ON -DPYTHON3LIBS_FOUND=ON \
75-
-DPYTHON3_EXECUTABLE=python \
76-
-DPYTHON3_VERSION_STRING=$(python -c "from platform import python_version; print(python_version())") \
77-
-DPYTHON3_INCLUDE_PATH=$(python -c "from distutils.sysconfig import get_python_inc; print(get_python_inc())") \
78-
-DPYTHON3_PACKAGES_PATH=$(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())") \
79-
-DPYTHON3_NUMPY_INCLUDE_DIRS=$(python -c "import os; os.environ['DISTUTILS_USE_SDK']='1'; import numpy.distutils; print(os.pathsep.join(numpy.distutils.misc_util.get_numpy_include_dirs()))") \
80-
-DPYTHON3_NUMPY_VERSION=$(python -c "import numpy; print(numpy.version.version)")
89+
-D WITH_IPP=OFF -D BUILD_DOCS=OFF \
90+
-D INSTALL_C_EXAMPLES=OFF -D INSTALL_PYTHON_EXAMPLES=OFF -D BUILD_TESTS=OFF -D BUILD_PERF_TESTS=OFF \
91+
-D BUILD_EXAMPLES=OFF \
92+
-D PYTHON3INTERP_FOUND=ON -DPYTHON3LIBS_FOUND=ON \
93+
-D PYTHON3_EXECUTABLE=python \
94+
-D PYTHON3_VERSION_STRING=$PYTHON_VERSION_STRING \
95+
-D PYTHON3_INCLUDE_PATH=$PYTHON_INCLUDE_PATH \
96+
-D PYTHON3_PACKAGES_PATH=$PYTHON_PACKAGES_PATH \
97+
-D PYTHON3_NUMPY_INCLUDE_DIRS=$PYTHON_NUMPY_INCLUDE_DIRS \
98+
-D PYTHON3_NUMPY_VERSION=$PYTHON_NUMPY_VERSION \
8199
fi
82100

83101
if [[ $PYTHON_VERSION == 2* ]]; then

0 commit comments

Comments
 (0)