Skip to content

Fix crash while building opencv for OSX #110

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 20, 2018
Merged

Fix crash while building opencv for OSX #110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bfd9eba
Add flag to setup.py call so skbuild doesn't default to osx 10.6
Jul 19, 2018
ce8b8cb
De-pollute parameters to bdist so its only on osx and make sure that …
Jul 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ env:
- "PS4='+(${BASH_SOURCE}:${LINENO}): ${FUNCNAME[0]:+${FUNCNAME[0]}(): }'"
# pip dependencies to _test_ your project
- TEST_DEPENDS="numpy==1.11.1"
# params to bdist_wheel. used to set osx build target.
- BDIST_PARAMS=""

- PLAT=x86_64
- UNICODE_WIDTH=32
Expand Down Expand Up @@ -35,34 +37,40 @@ matrix:
- MB_PYTHON_VERSION=2.7
- ENABLE_CONTRIB=0
- ENABLE_HEADLESS=0
- BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
- os: osx
language: generic
osx_image: xcode8
env:
- MB_PYTHON_VERSION=3.4
- ENABLE_CONTRIB=0
- ENABLE_HEADLESS=0
- BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
- os: osx
language: generic
osx_image: xcode8
env:
- MB_PYTHON_VERSION=3.5
- ENABLE_CONTRIB=0
- ENABLE_HEADLESS=0
- BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
- os: osx
language: generic
osx_image: xcode8
env:
- MB_PYTHON_VERSION=3.6
- ENABLE_CONTRIB=0
- ENABLE_HEADLESS=0
- BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
- os: osx
language: generic
osx_image: xcode8
env:
- MB_PYTHON_VERSION=3.7
- ENABLE_CONTRIB=0
- ENABLE_HEADLESS=0
- BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
- TEST_DEPENDS=numpy==1.14.5

# headless builds for MacOS
- os: osx
Expand All @@ -72,34 +80,40 @@ matrix:
- MB_PYTHON_VERSION=2.7
- ENABLE_CONTRIB=0
- ENABLE_HEADLESS=1
- BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
- os: osx
language: generic
osx_image: xcode8
env:
- MB_PYTHON_VERSION=3.4
- ENABLE_CONTRIB=0
- ENABLE_HEADLESS=1
- BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
- os: osx
language: generic
osx_image: xcode8
env:
- MB_PYTHON_VERSION=3.5
- ENABLE_CONTRIB=0
- ENABLE_HEADLESS=1
- BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
- os: osx
language: generic
osx_image: xcode8
env:
- MB_PYTHON_VERSION=3.6
- ENABLE_CONTRIB=0
- ENABLE_HEADLESS=1
- BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
- os: osx
language: generic
osx_image: xcode8
env:
- MB_PYTHON_VERSION=3.7
- ENABLE_CONTRIB=0
- ENABLE_HEADLESS=1
- BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
- TEST_DEPENDS=numpy==1.14.5

# Contrib builds for MacOS
- os: osx
Expand All @@ -109,34 +123,40 @@ matrix:
- MB_PYTHON_VERSION=2.7
- ENABLE_CONTRIB=1
- ENABLE_HEADLESS=0
- BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
- os: osx
language: generic
osx_image: xcode8
env:
- MB_PYTHON_VERSION=3.4
- ENABLE_CONTRIB=1
- ENABLE_HEADLESS=0
- BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
- os: osx
language: generic
osx_image: xcode8
env:
- MB_PYTHON_VERSION=3.5
- ENABLE_CONTRIB=1
- ENABLE_HEADLESS=0
- BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
- os: osx
language: generic
osx_image: xcode8
env:
- MB_PYTHON_VERSION=3.6
- ENABLE_CONTRIB=1
- ENABLE_HEADLESS=0
- BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
- os: osx
language: generic
osx_image: xcode8
env:
- MB_PYTHON_VERSION=3.7
- ENABLE_CONTRIB=1
- ENABLE_HEADLESS=0
- BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
- TEST_DEPENDS=numpy==1.14.5

# headless contrib builds for MacOS
- os: osx
Expand All @@ -146,34 +166,40 @@ matrix:
- MB_PYTHON_VERSION=2.7
- ENABLE_CONTRIB=1
- ENABLE_HEADLESS=1
- BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
- os: osx
language: generic
osx_image: xcode8
env:
- MB_PYTHON_VERSION=3.4
- ENABLE_CONTRIB=1
- ENABLE_HEADLESS=1
- BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
- os: osx
language: generic
osx_image: xcode8
env:
- MB_PYTHON_VERSION=3.5
- ENABLE_CONTRIB=1
- ENABLE_HEADLESS=1
- BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
- os: osx
language: generic
osx_image: xcode8
env:
- MB_PYTHON_VERSION=3.6
- ENABLE_CONTRIB=1
- ENABLE_HEADLESS=1
- BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
- os: osx
language: generic
osx_image: xcode8
env:
- MB_PYTHON_VERSION=3.7
- ENABLE_CONTRIB=1
- ENABLE_HEADLESS=1
- BDIST_PARAMS="-- -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.7"
- TEST_DEPENDS=numpy==1.14.5

# default builds for Linux
- os: linux
Expand Down
8 changes: 8 additions & 0 deletions config.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,14 @@ function build_wheel {
build_bdist_wheel $@
}

function bdist_wheel_cmd {
# copied from multibuild's common_utils.sh
# add osx deployment target so it doesnt default to 10.6
local abs_wheelhouse=$1
python setup.py bdist_wheel $BDIST_PARAMS
cp dist/*.whl $abs_wheelhouse
}

if [ -n "$IS_OSX" ]; then
echo " > OSX environment "
else
Expand Down