Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit a7991d7

Browse filesBrowse files
skvarkskvark
committed
upgrade macOS env to xcode9.4 and use Qt5
1 parent 6d91fc2 commit a7991d7
Copy full SHA for a7991d7

File tree

Expand file treeCollapse file tree

3 files changed

+28
-26
lines changed
Filter options
Expand file treeCollapse file tree

3 files changed

+28
-26
lines changed

‎.travis.yml

Copy file name to clipboardExpand all lines: .travis.yml
+21-21Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ matrix:
3838
include:
3939

4040
- os: osx
41-
osx_image: xcode8.3
41+
osx_image: xcode9.4
4242
stage: s1
4343
workspaces:
4444
create:
@@ -64,31 +64,31 @@ matrix:
6464
#further jobs in the list will use the same stage until the next assignment
6565
- stage: final
6666
os: osx
67-
osx_image: xcode8.3
67+
osx_image: xcode9.4
6868
env:
6969
- MB_PYTHON_VERSION=2.7
7070
- ENABLE_CONTRIB=0
7171
- ENABLE_HEADLESS=0
7272
workspaces:
7373
use: brew_cache
7474
- os: osx
75-
osx_image: xcode8.3
75+
osx_image: xcode9.4
7676
env:
7777
- MB_PYTHON_VERSION=3.5
7878
- ENABLE_CONTRIB=0
7979
- ENABLE_HEADLESS=0
8080
workspaces:
8181
use: brew_cache
8282
- os: osx
83-
osx_image: xcode8.3
83+
osx_image: xcode9.4
8484
env:
8585
- MB_PYTHON_VERSION=3.6
8686
- ENABLE_CONTRIB=0
8787
- ENABLE_HEADLESS=0
8888
workspaces:
8989
use: brew_cache
9090
- os: osx
91-
osx_image: xcode8.3
91+
osx_image: xcode9.4
9292
env:
9393
- MB_PYTHON_VERSION=3.7
9494
- ENABLE_CONTRIB=0
@@ -97,7 +97,7 @@ matrix:
9797
workspaces:
9898
use: brew_cache
9999
- os: osx
100-
osx_image: xcode8.3
100+
osx_image: xcode9.4
101101
env:
102102
- MB_PYTHON_VERSION=3.8
103103
- ENABLE_CONTRIB=0
@@ -108,31 +108,31 @@ matrix:
108108

109109
# headless builds for MacOS
110110
- os: osx
111-
osx_image: xcode8.3
111+
osx_image: xcode9.4
112112
env:
113113
- MB_PYTHON_VERSION=2.7
114114
- ENABLE_CONTRIB=0
115115
- ENABLE_HEADLESS=1
116116
workspaces:
117117
use: brew_cache
118118
- os: osx
119-
osx_image: xcode8.3
119+
osx_image: xcode9.4
120120
env:
121121
- MB_PYTHON_VERSION=3.5
122122
- ENABLE_CONTRIB=0
123123
- ENABLE_HEADLESS=1
124124
workspaces:
125125
use: brew_cache
126126
- os: osx
127-
osx_image: xcode8.3
127+
osx_image: xcode9.4
128128
env:
129129
- MB_PYTHON_VERSION=3.6
130130
- ENABLE_CONTRIB=0
131131
- ENABLE_HEADLESS=1
132132
workspaces:
133133
use: brew_cache
134134
- os: osx
135-
osx_image: xcode8.3
135+
osx_image: xcode9.4
136136
env:
137137
- MB_PYTHON_VERSION=3.7
138138
- ENABLE_CONTRIB=0
@@ -141,7 +141,7 @@ matrix:
141141
workspaces:
142142
use: brew_cache
143143
- os: osx
144-
osx_image: xcode8.3
144+
osx_image: xcode9.4
145145
env:
146146
- MB_PYTHON_VERSION=3.8
147147
- ENABLE_CONTRIB=0
@@ -152,31 +152,31 @@ matrix:
152152

153153
# Contrib builds for MacOS
154154
- os: osx
155-
osx_image: xcode8.3
155+
osx_image: xcode9.4
156156
env:
157157
- MB_PYTHON_VERSION=2.7
158158
- ENABLE_CONTRIB=1
159159
- ENABLE_HEADLESS=0
160160
workspaces:
161161
use: brew_cache
162162
- os: osx
163-
osx_image: xcode8.3
163+
osx_image: xcode9.4
164164
env:
165165
- MB_PYTHON_VERSION=3.5
166166
- ENABLE_CONTRIB=1
167167
- ENABLE_HEADLESS=0
168168
workspaces:
169169
use: brew_cache
170170
- os: osx
171-
osx_image: xcode8.3
171+
osx_image: xcode9.4
172172
env:
173173
- MB_PYTHON_VERSION=3.6
174174
- ENABLE_CONTRIB=1
175175
- ENABLE_HEADLESS=0
176176
workspaces:
177177
use: brew_cache
178178
- os: osx
179-
osx_image: xcode8.3
179+
osx_image: xcode9.4
180180
env:
181181
- MB_PYTHON_VERSION=3.7
182182
- ENABLE_CONTRIB=1
@@ -185,7 +185,7 @@ matrix:
185185
workspaces:
186186
use: brew_cache
187187
- os: osx
188-
osx_image: xcode8.3
188+
osx_image: xcode9.4
189189
env:
190190
- MB_PYTHON_VERSION=3.8
191191
- ENABLE_CONTRIB=1
@@ -196,31 +196,31 @@ matrix:
196196

197197
# headless contrib builds for MacOS
198198
- os: osx
199-
osx_image: xcode8.3
199+
osx_image: xcode9.4
200200
env:
201201
- MB_PYTHON_VERSION=2.7
202202
- ENABLE_CONTRIB=1
203203
- ENABLE_HEADLESS=1
204204
workspaces:
205205
use: brew_cache
206206
- os: osx
207-
osx_image: xcode8.3
207+
osx_image: xcode9.4
208208
env:
209209
- MB_PYTHON_VERSION=3.5
210210
- ENABLE_CONTRIB=1
211211
- ENABLE_HEADLESS=1
212212
workspaces:
213213
use: brew_cache
214214
- os: osx
215-
osx_image: xcode8.3
215+
osx_image: xcode9.4
216216
env:
217217
- MB_PYTHON_VERSION=3.6
218218
- ENABLE_CONTRIB=1
219219
- ENABLE_HEADLESS=1
220220
workspaces:
221221
use: brew_cache
222222
- os: osx
223-
osx_image: xcode8.3
223+
osx_image: xcode9.4
224224
env:
225225
- MB_PYTHON_VERSION=3.7
226226
- ENABLE_CONTRIB=1
@@ -229,7 +229,7 @@ matrix:
229229
workspaces:
230230
use: brew_cache
231231
- os: osx
232-
osx_image: xcode8.3
232+
osx_image: xcode9.4
233233
env:
234234
- MB_PYTHON_VERSION=3.8
235235
- ENABLE_CONTRIB=1

‎setup.py

Copy file name to clipboardExpand all lines: setup.py
+4-1Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,12 @@ def main():
123123
] + (["-DOPENCV_EXTRA_MODULES_PATH=" + os.path.abspath("opencv_contrib/modules")] if build_contrib else [])
124124

125125
# OS-specific components
126-
if (sys.platform == 'darwin' or sys.platform.startswith('linux')) and not build_headless:
126+
if sys.platform.startswith('linux') and not build_headless:
127127
cmake_args.append("-DWITH_QT=4")
128128

129+
if sys.platform == 'darwin' and not build_headless:
130+
cmake_args.append("-DWITH_QT=5")
131+
129132
if build_headless:
130133
# it seems that cocoa cannot be disabled so on macOS the package is not truly headless
131134
cmake_args.append("-DWITH_WIN32UI=OFF")

‎travis_config.sh

Copy file name to clipboardExpand all lines: travis_config.sh
+3-4Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,12 +96,11 @@ function pre_build {
9696
brew_add_local_bottles
9797
fi
9898

99-
echo 'Installing QT4'
100-
brew tap | grep -qxF cartr/qt4 || brew tap cartr/qt4
99+
echo 'Installing qt5'
101100
if [ -n "$CACHE_STAGE" ]; then
102-
brew_install_and_cache_within_time_limit cartr/qt4/qt@4 || { [ $? -gt 1 ] && return 2 || return 0; }
101+
brew_install_and_cache_within_time_limit qt5 || { [ $? -gt 1 ] && return 2 || return 0; }
103102
else
104-
brew install cartr/qt4/qt@4
103+
brew install qt5
105104
fi
106105

107106
echo 'Installing FFmpeg'

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.