Skip to content

Commit a62380b

Browse files
skvarkskvark
committed
xcode9.3
1 parent 0ef8126 commit a62380b

File tree

3 files changed

+22
-21
lines changed

3 files changed

+22
-21
lines changed

‎.travis.yml‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -30,35 +30,35 @@ matrix:
3030
# default builds for MacOS
3131
- os: osx
3232
language: generic
33-
osx_image: xcode7.3
33+
osx_image: xcode9.2
3434
env:
3535
- MB_PYTHON_VERSION=2.7
3636
- ENABLE_CONTRIB=0
3737
- ENABLE_HEADLESS=0
3838
- os: osx
3939
language: generic
40-
osx_image: xcode7.3
40+
osx_image: xcode9.2
4141
env:
4242
- MB_PYTHON_VERSION=3.4
4343
- ENABLE_CONTRIB=0
4444
- ENABLE_HEADLESS=0
4545
- os: osx
4646
language: generic
47-
osx_image: xcode7.3
47+
osx_image: xcode9.2
4848
env:
4949
- MB_PYTHON_VERSION=3.5
5050
- ENABLE_CONTRIB=0
5151
- ENABLE_HEADLESS=0
5252
- os: osx
5353
language: generic
54-
osx_image: xcode7.3
54+
osx_image: xcode9.2
5555
env:
5656
- MB_PYTHON_VERSION=3.6
5757
- ENABLE_CONTRIB=0
5858
- ENABLE_HEADLESS=0
5959
- os: osx
6060
language: generic
61-
osx_image: xcode7.3
61+
osx_image: xcode9.2
6262
env:
6363
- MB_PYTHON_VERSION=3.7
6464
- ENABLE_CONTRIB=0
@@ -67,35 +67,35 @@ matrix:
6767
# headless builds for MacOS
6868
- os: osx
6969
language: generic
70-
osx_image: xcode7.3
70+
osx_image: xcode9.2
7171
env:
7272
- MB_PYTHON_VERSION=2.7
7373
- ENABLE_CONTRIB=0
7474
- ENABLE_HEADLESS=1
7575
- os: osx
7676
language: generic
77-
osx_image: xcode7.3
77+
osx_image: xcode9.2
7878
env:
7979
- MB_PYTHON_VERSION=3.4
8080
- ENABLE_CONTRIB=0
8181
- ENABLE_HEADLESS=1
8282
- os: osx
8383
language: generic
84-
osx_image: xcode7.3
84+
osx_image: xcode9.2
8585
env:
8686
- MB_PYTHON_VERSION=3.5
8787
- ENABLE_CONTRIB=0
8888
- ENABLE_HEADLESS=1
8989
- os: osx
9090
language: generic
91-
osx_image: xcode7.3
91+
osx_image: xcode9.2
9292
env:
9393
- MB_PYTHON_VERSION=3.6
9494
- ENABLE_CONTRIB=0
9595
- ENABLE_HEADLESS=1
9696
- os: osx
9797
language: generic
98-
osx_image: xcode7.3
98+
osx_image: xcode9.2
9999
env:
100100
- MB_PYTHON_VERSION=3.7
101101
- ENABLE_CONTRIB=0
@@ -104,35 +104,35 @@ matrix:
104104
# Contrib builds for MacOS
105105
- os: osx
106106
language: generic
107-
osx_image: xcode7.3
107+
osx_image: xcode9.2
108108
env:
109109
- MB_PYTHON_VERSION=2.7
110110
- ENABLE_CONTRIB=1
111111
- ENABLE_HEADLESS=0
112112
- os: osx
113113
language: generic
114-
osx_image: xcode7.3
114+
osx_image: xcode9.2
115115
env:
116116
- MB_PYTHON_VERSION=3.4
117117
- ENABLE_CONTRIB=1
118118
- ENABLE_HEADLESS=0
119119
- os: osx
120120
language: generic
121-
osx_image: xcode7.3
121+
osx_image: xcode9.2
122122
env:
123123
- MB_PYTHON_VERSION=3.5
124124
- ENABLE_CONTRIB=1
125125
- ENABLE_HEADLESS=0
126126
- os: osx
127127
language: generic
128-
osx_image: xcode7.3
128+
osx_image: xcode9.2
129129
env:
130130
- MB_PYTHON_VERSION=3.6
131131
- ENABLE_CONTRIB=1
132132
- ENABLE_HEADLESS=0
133133
- os: osx
134134
language: generic
135-
osx_image: xcode7.3
135+
osx_image: xcode9.2
136136
env:
137137
- MB_PYTHON_VERSION=3.7
138138
- ENABLE_CONTRIB=1
@@ -141,35 +141,35 @@ matrix:
141141
# headless contrib builds for MacOS
142142
- os: osx
143143
language: generic
144-
osx_image: xcode7.3
144+
osx_image: xcode9.2
145145
env:
146146
- MB_PYTHON_VERSION=2.7
147147
- ENABLE_CONTRIB=1
148148
- ENABLE_HEADLESS=1
149149
- os: osx
150150
language: generic
151-
osx_image: xcode7.3
151+
osx_image: xcode9.2
152152
env:
153153
- MB_PYTHON_VERSION=3.4
154154
- ENABLE_CONTRIB=1
155155
- ENABLE_HEADLESS=1
156156
- os: osx
157157
language: generic
158-
osx_image: xcode7.3
158+
osx_image: xcode9.2
159159
env:
160160
- MB_PYTHON_VERSION=3.5
161161
- ENABLE_CONTRIB=1
162162
- ENABLE_HEADLESS=1
163163
- os: osx
164164
language: generic
165-
osx_image: xcode7.3
165+
osx_image: xcode9.2
166166
env:
167167
- MB_PYTHON_VERSION=3.6
168168
- ENABLE_CONTRIB=1
169169
- ENABLE_HEADLESS=1
170170
- os: osx
171171
language: generic
172-
osx_image: xcode7.3
172+
osx_image: xcode9.2
173173
env:
174174
- MB_PYTHON_VERSION=3.7
175175
- ENABLE_CONTRIB=1

‎config.sh‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ function pre_build {
2525

2626
brew update
2727

28+
export CXXFLAGS=-mmacosx-version-min=10.10
29+
2830
echo 'Installing QT4'
2931
brew tap | grep -qxF cartr/qt4 || brew tap -v cartr/qt4
3032
brew tap --list-pinned | grep -qxF cartr/qt4 || brew tap-pin -v cartr/qt4

‎setup.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,6 @@ def main():
137137
if sys.platform == 'darwin':
138138
cmake_args.append("-DWITH_LAPACK=OFF") # Some OSX LAPACK fns are incompatible, see
139139
# https://github.com/skvark/opencv-python/issues/21
140-
cmake_args.append("-DMACOSX_DEPLOYMENT_TARGET=10.10")
141140

142141
if sys.platform.startswith('linux'):
143142
cmake_args.append("-DWITH_IPP=OFF") # https://github.com/opencv/opencv/issues/10411

0 commit comments

Comments
 (0)