Skip to content

Commit 0015549

Browse files
skvarkskvark
authored
Merge pull request #110 from yonip/master
Fix crash while building opencv for OSX
2 parents ba3547c + ce8b8cb commit 0015549

File tree

2 files changed

+34
-0
lines changed

2 files changed

+34
-0
lines changed

‎.travis.yml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ env:
33
- "PS4='+(${BASH_SOURCE}:${LINENO}): ${FUNCNAME[0]:+${FUNCNAME[0]}(): }'"
44
# pip dependencies to _test_ your project
55
- TEST_DEPENDS="numpy==1.11.1"
6+
# params to bdist_wheel. used to set osx build target.
7+
- BDIST_PARAMS=""
68

79
- PLAT=x86_64
810
- UNICODE_WIDTH=32
@@ -35,34 +37,40 @@ matrix:
3537
- MB_PYTHON_VERSION=2.7
3638
- ENABLE_CONTRIB=0
3739
- ENABLE_HEADLESS=0
40+
- BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
3841
- os: osx
3942
language: generic
4043
osx_image: xcode8
4144
env:
4245
- MB_PYTHON_VERSION=3.4
4346
- ENABLE_CONTRIB=0
4447
- ENABLE_HEADLESS=0
48+
- BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
4549
- os: osx
4650
language: generic
4751
osx_image: xcode8
4852
env:
4953
- MB_PYTHON_VERSION=3.5
5054
- ENABLE_CONTRIB=0
5155
- ENABLE_HEADLESS=0
56+
- BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
5257
- os: osx
5358
language: generic
5459
osx_image: xcode8
5560
env:
5661
- MB_PYTHON_VERSION=3.6
5762
- ENABLE_CONTRIB=0
5863
- ENABLE_HEADLESS=0
64+
- BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
5965
- os: osx
6066
language: generic
6167
osx_image: xcode8
6268
env:
6369
- MB_PYTHON_VERSION=3.7
6470
- ENABLE_CONTRIB=0
6571
- ENABLE_HEADLESS=0
72+
- BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
73+
- TEST_DEPENDS=numpy==1.14.5
6674

6775
# headless builds for MacOS
6876
- os: osx
@@ -72,34 +80,40 @@ matrix:
7280
- MB_PYTHON_VERSION=2.7
7381
- ENABLE_CONTRIB=0
7482
- ENABLE_HEADLESS=1
83+
- BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
7584
- os: osx
7685
language: generic
7786
osx_image: xcode8
7887
env:
7988
- MB_PYTHON_VERSION=3.4
8089
- ENABLE_CONTRIB=0
8190
- ENABLE_HEADLESS=1
91+
- BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
8292
- os: osx
8393
language: generic
8494
osx_image: xcode8
8595
env:
8696
- MB_PYTHON_VERSION=3.5
8797
- ENABLE_CONTRIB=0
8898
- ENABLE_HEADLESS=1
99+
- BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
89100
- os: osx
90101
language: generic
91102
osx_image: xcode8
92103
env:
93104
- MB_PYTHON_VERSION=3.6
94105
- ENABLE_CONTRIB=0
95106
- ENABLE_HEADLESS=1
107+
- BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
96108
- os: osx
97109
language: generic
98110
osx_image: xcode8
99111
env:
100112
- MB_PYTHON_VERSION=3.7
101113
- ENABLE_CONTRIB=0
102114
- ENABLE_HEADLESS=1
115+
- BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
116+
- TEST_DEPENDS=numpy==1.14.5
103117

104118
# Contrib builds for MacOS
105119
- os: osx
@@ -109,34 +123,40 @@ matrix:
109123
- MB_PYTHON_VERSION=2.7
110124
- ENABLE_CONTRIB=1
111125
- ENABLE_HEADLESS=0
126+
- BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
112127
- os: osx
113128
language: generic
114129
osx_image: xcode8
115130
env:
116131
- MB_PYTHON_VERSION=3.4
117132
- ENABLE_CONTRIB=1
118133
- ENABLE_HEADLESS=0
134+
- BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
119135
- os: osx
120136
language: generic
121137
osx_image: xcode8
122138
env:
123139
- MB_PYTHON_VERSION=3.5
124140
- ENABLE_CONTRIB=1
125141
- ENABLE_HEADLESS=0
142+
- BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
126143
- os: osx
127144
language: generic
128145
osx_image: xcode8
129146
env:
130147
- MB_PYTHON_VERSION=3.6
131148
- ENABLE_CONTRIB=1
132149
- ENABLE_HEADLESS=0
150+
- BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
133151
- os: osx
134152
language: generic
135153
osx_image: xcode8
136154
env:
137155
- MB_PYTHON_VERSION=3.7
138156
- ENABLE_CONTRIB=1
139157
- ENABLE_HEADLESS=0
158+
- BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
159+
- TEST_DEPENDS=numpy==1.14.5
140160

141161
# headless contrib builds for MacOS
142162
- os: osx
@@ -146,34 +166,40 @@ matrix:
146166
- MB_PYTHON_VERSION=2.7
147167
- ENABLE_CONTRIB=1
148168
- ENABLE_HEADLESS=1
169+
- BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
149170
- os: osx
150171
language: generic
151172
osx_image: xcode8
152173
env:
153174
- MB_PYTHON_VERSION=3.4
154175
- ENABLE_CONTRIB=1
155176
- ENABLE_HEADLESS=1
177+
- BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
156178
- os: osx
157179
language: generic
158180
osx_image: xcode8
159181
env:
160182
- MB_PYTHON_VERSION=3.5
161183
- ENABLE_CONTRIB=1
162184
- ENABLE_HEADLESS=1
185+
- BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
163186
- os: osx
164187
language: generic
165188
osx_image: xcode8
166189
env:
167190
- MB_PYTHON_VERSION=3.6
168191
- ENABLE_CONTRIB=1
169192
- ENABLE_HEADLESS=1
193+
- BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
170194
- os: osx
171195
language: generic
172196
osx_image: xcode8
173197
env:
174198
- MB_PYTHON_VERSION=3.7
175199
- ENABLE_CONTRIB=1
176200
- ENABLE_HEADLESS=1
201+
- BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
202+
- TEST_DEPENDS=numpy==1.14.5
177203

178204
# default builds for Linux
179205
- os: linux

‎config.sh

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,14 @@ function build_wheel {
1010
build_bdist_wheel $@
1111
}
1212

13+
function bdist_wheel_cmd {
14+
# copied from multibuild's common_utils.sh
15+
# add osx deployment target so it doesnt default to 10.6
16+
local abs_wheelhouse=$1
17+
python setup.py bdist_wheel $BDIST_PARAMS
18+
cp dist/*.whl $abs_wheelhouse
19+
}
20+
1321
if [ -n "$IS_OSX" ]; then
1422
echo " > OSX environment "
1523
else

0 commit comments

Comments
 (0)