Skip to content
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

Jump to bottom

try to fix travis osx boost1.69/gadgetron #247

Merged
merged 3 commits into from
May 21, 2019
Merged

try to fix travis osx boost1.69/gadgetron #247

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bfda9fd
try to fix travis osx boost1.69/gadgetron
May 17, 2019
e47128d
bad .travis.yml
May 17, 2019
8bf2539
include all OSX matrices
May 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
45 changes: 24 additions & 21 deletions .travis.yml
View file
Open in desktop
Expand Up @@ -44,32 +44,31 @@ matrix:
python: 2.7
# +DEVEL -boost -fftw3 -hdf5 -swig +ace
env: EXTRA_BUILD_FLAGS="-DDEVEL_BUILD=ON -DUSE_SYSTEM_Boost=OFF -DUSE_SYSTEM_FFTW3=OFF -DUSE_SYSTEM_HDF5=OFF -DUSE_SYSTEM_ACE=ON -DUSE_SYSTEM_SWIG=OFF" MATRIX_EVAL="CC=gcc-6 CXX=g++-6" PYMVER=2
# osx g{cc,++} py{27,36}
# - os: osx
# python: 2.7
# # +boost -hdf5 -swig
# env: EXTRA_BUILD_FLAGS="-DUSE_SYSTEM_Boost=ON -DUSE_SYSTEM_HDF5=OFF -DUSE_SYSTEM_SWIG=OFF" MATRIX_EVAL="CC=gcc CXX=g++" PYMVER=2
# - os: osx
# # +boost +fftw3 -hdf5 -swig
# python: 3
# env: EXTRA_BUILD_FLAGS="-DUSE_SYSTEM_Boost=ON -DUSE_SYSTEM_FFTW3=ON -DUSE_SYSTEM_HDF5=OFF -DUSE_SYSTEM_SWIG=OFF" MATRIX_EVAL="CC=gcc CXX=g++" PYMVER=3
# - os: osx
# python: 2.7
# # +DEVEL +boost -hdf5 +swig
# env: EXTRA_BUILD_FLAGS="-DDEVEL_BUILD=ON -DUSE_SYSTEM_Boost=ON -DUSE_SYSTEM_HDF5=OFF -DUSE_SYSTEM_SWIG=ON" MATRIX_EVAL="CC=gcc CXX=g++" PYMVER=2
# - os: osx
# python: 2.7
# # +DEVEL +boost -fftw3 -hdf5 +swig
# env: EXTRA_BUILD_FLAGS="-DDEVEL_BUILD=ON -DUSE_SYSTEM_Boost=ON -DUSE_SYSTEM_FFTW3=OFF -DUSE_SYSTEM_HDF5=OFF -DUSE_SYSTEM_SWIG=ON" MATRIX_EVAL="CC=gcc CXX=g++" PYMVER=2
- os: osx
python: 2.7
# +boost -hdf5 -swig
env: EXTRA_BUILD_FLAGS="-DUSE_SYSTEM_Boost=ON -DUSE_SYSTEM_HDF5=OFF -DUSE_SYSTEM_SWIG=OFF" MATRIX_EVAL="CC=gcc CXX=g++" PYMVER=2
- os: osx
# +boost +fftw3 -hdf5 -swig
python: 3
env: EXTRA_BUILD_FLAGS="-DUSE_SYSTEM_Boost=ON -DUSE_SYSTEM_FFTW3=ON -DUSE_SYSTEM_HDF5=OFF -DUSE_SYSTEM_SWIG=OFF" MATRIX_EVAL="CC=gcc CXX=g++" PYMVER=3
- os: osx
python: 2.7
# +DEVEL +boost -hdf5 +swig
env: EXTRA_BUILD_FLAGS="-DDEVEL_BUILD=ON -DUSE_SYSTEM_Boost=ON -DUSE_SYSTEM_HDF5=OFF -DUSE_SYSTEM_SWIG=ON" MATRIX_EVAL="CC=gcc CXX=g++" PYMVER=2
- os: osx
python: 2.7
# +DEVEL +boost -fftw3 -hdf5 +swig
env: EXTRA_BUILD_FLAGS="-DDEVEL_BUILD=ON -DUSE_SYSTEM_Boost=ON -DUSE_SYSTEM_FFTW3=OFF -DUSE_SYSTEM_HDF5=OFF -DUSE_SYSTEM_SWIG=ON" MATRIX_EVAL="CC=gcc CXX=g++" PYMVER=2
# itk
- os: linux
python: 3
# -boost +itk +fftw3 +hdf5
env: EXTRA_BUILD_FLAGS="-DUSE_SYSTEM_Boost=OFF -DUSE_ITK=ON -DUSE_SYSTEM_FFTW3=ON -DUSE_SYSTEM_HDF5=ON" MATRIX_EVAL="CC=gcc-6 CXX=g++-6" PYMVER=3
# - os: osx
# python: 2.7
# # +boost +itk -hdf5 +swig
# env: EXTRA_BUILD_FLAGS="-DUSE_SYSTEM_Boost=ON -DUSE_ITK=ON -DUSE_SYSTEM_HDF5=OFF -DUSE_SYSTEM_SWIG=ON" MATRIX_EVAL="CC=gcc CXX=g++" PYMVER=2
- os: osx
python: 2.7
# +boost +itk -hdf5 +swig
env: EXTRA_BUILD_FLAGS="-DUSE_SYSTEM_Boost=ON -DUSE_ITK=ON -DUSE_SYSTEM_HDF5=OFF -DUSE_SYSTEM_SWIG=ON" MATRIX_EVAL="CC=gcc CXX=g++" PYMVER=2
# docker
- os: linux
# +ace +armadillo +boost +fftw3 +hdf5 +itk +siemens_to_ismrmrd +swig
Expand Down Expand Up @@ -168,6 +167,10 @@ before_install:
( set -ev
# boost is already installed but 1.65 doesn't work so update
brew reinstall boost
# As of boost 1.69, boost.Process is broken. https://stackoverflow.com/a/54912043
# To fix, remove :: from all occurences of ::sigtimedwait, ::sigaddset and ::sigemptyset
# Hopefully will be able to remove this at some point...
find /usr/local/include/boost/ -name '*.hpp' -exec sed -i -e "s/::sigtimedwait/sigtimedwait/g; s/::sigaddset/sigaddset/g; s/::sigemptyset/sigemptyset/g; " {} \;
# we currently need boost-python
# brew install boost-python
brew install ace
Expand Down