Skip to content

Commit 008134f

Browse files
native-apiskvark
authored andcommitted
Move CMAKE_OSX_DEPLOYMENT_TARGET to setup.py
1 parent c824854 commit 008134f

File tree

2 files changed

+1
-20
lines changed

2 files changed

+1
-20
lines changed

.travis.yml

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -45,35 +45,30 @@ matrix:
4545
- MB_PYTHON_VERSION=2.7
4646
- ENABLE_CONTRIB=0
4747
- ENABLE_HEADLESS=0
48-
- BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
4948
- os: osx
5049
osx_image: xcode8
5150
env:
5251
- MB_PYTHON_VERSION=3.4
5352
- ENABLE_CONTRIB=0
5453
- ENABLE_HEADLESS=0
55-
- BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
5654
- os: osx
5755
osx_image: xcode8
5856
env:
5957
- MB_PYTHON_VERSION=3.5
6058
- ENABLE_CONTRIB=0
6159
- ENABLE_HEADLESS=0
62-
- BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
6360
- os: osx
6461
osx_image: xcode8
6562
env:
6663
- MB_PYTHON_VERSION=3.6
6764
- ENABLE_CONTRIB=0
6865
- ENABLE_HEADLESS=0
69-
- BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
7066
- os: osx
7167
osx_image: xcode8
7268
env:
7369
- MB_PYTHON_VERSION=3.7
7470
- ENABLE_CONTRIB=0
7571
- ENABLE_HEADLESS=0
76-
- BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
7772
- TEST_DEPENDS=numpy==1.14.5
7873

7974
# headless builds for MacOS
@@ -83,35 +78,30 @@ matrix:
8378
- MB_PYTHON_VERSION=2.7
8479
- ENABLE_CONTRIB=0
8580
- ENABLE_HEADLESS=1
86-
- BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
8781
- os: osx
8882
osx_image: xcode8
8983
env:
9084
- MB_PYTHON_VERSION=3.4
9185
- ENABLE_CONTRIB=0
9286
- ENABLE_HEADLESS=1
93-
- BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
9487
- os: osx
9588
osx_image: xcode8
9689
env:
9790
- MB_PYTHON_VERSION=3.5
9891
- ENABLE_CONTRIB=0
9992
- ENABLE_HEADLESS=1
100-
- BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
10193
- os: osx
10294
osx_image: xcode8
10395
env:
10496
- MB_PYTHON_VERSION=3.6
10597
- ENABLE_CONTRIB=0
10698
- ENABLE_HEADLESS=1
107-
- BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
10899
- os: osx
109100
osx_image: xcode8
110101
env:
111102
- MB_PYTHON_VERSION=3.7
112103
- ENABLE_CONTRIB=0
113104
- ENABLE_HEADLESS=1
114-
- BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
115105
- TEST_DEPENDS=numpy==1.14.5
116106

117107
# Contrib builds for MacOS
@@ -121,35 +111,30 @@ matrix:
121111
- MB_PYTHON_VERSION=2.7
122112
- ENABLE_CONTRIB=1
123113
- ENABLE_HEADLESS=0
124-
- BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
125114
- os: osx
126115
osx_image: xcode8
127116
env:
128117
- MB_PYTHON_VERSION=3.4
129118
- ENABLE_CONTRIB=1
130119
- ENABLE_HEADLESS=0
131-
- BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
132120
- os: osx
133121
osx_image: xcode8
134122
env:
135123
- MB_PYTHON_VERSION=3.5
136124
- ENABLE_CONTRIB=1
137125
- ENABLE_HEADLESS=0
138-
- BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
139126
- os: osx
140127
osx_image: xcode8
141128
env:
142129
- MB_PYTHON_VERSION=3.6
143130
- ENABLE_CONTRIB=1
144131
- ENABLE_HEADLESS=0
145-
- BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
146132
- os: osx
147133
osx_image: xcode8
148134
env:
149135
- MB_PYTHON_VERSION=3.7
150136
- ENABLE_CONTRIB=1
151137
- ENABLE_HEADLESS=0
152-
- BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
153138
- TEST_DEPENDS=numpy==1.14.5
154139

155140
# headless contrib builds for MacOS
@@ -159,35 +144,30 @@ matrix:
159144
- MB_PYTHON_VERSION=2.7
160145
- ENABLE_CONTRIB=1
161146
- ENABLE_HEADLESS=1
162-
- BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
163147
- os: osx
164148
osx_image: xcode8
165149
env:
166150
- MB_PYTHON_VERSION=3.4
167151
- ENABLE_CONTRIB=1
168152
- ENABLE_HEADLESS=1
169-
- BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
170153
- os: osx
171154
osx_image: xcode8
172155
env:
173156
- MB_PYTHON_VERSION=3.5
174157
- ENABLE_CONTRIB=1
175158
- ENABLE_HEADLESS=1
176-
- BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
177159
- os: osx
178160
osx_image: xcode8
179161
env:
180162
- MB_PYTHON_VERSION=3.6
181163
- ENABLE_CONTRIB=1
182164
- ENABLE_HEADLESS=1
183-
- BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
184165
- os: osx
185166
osx_image: xcode8
186167
env:
187168
- MB_PYTHON_VERSION=3.7
188169
- ENABLE_CONTRIB=1
189170
- ENABLE_HEADLESS=1
190-
- BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
191171
- TEST_DEPENDS=numpy==1.14.5
192172

193173
# default builds for Linux

setup.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@ def main():
141141
cmake_args.append("-DWITH_LAPACK=OFF") # Some OSX LAPACK fns are incompatible, see
142142
# https://github.com/skvark/opencv-python/issues/21
143143
cmake_args.append("-DCMAKE_CXX_FLAGS=-stdlib=libc++")
144+
cmake_args.append("-DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7")
144145

145146
if sys.platform.startswith('linux'):
146147
cmake_args.append("-DWITH_IPP=OFF") # tests fail with IPP compiled with

0 commit comments

Comments
 (0)