Skip to content
Closed
Changes from all commits
Commits
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
17 changes: 8 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,11 @@ matrix:
# OSX
############################################################################

# FIXME: Error exit code when installing OpenCV with Brew
# OSX build
#- os: osx
#compiler: clang
#env:
#- ENV_CXX_FLAGS="-Wno-c99-extensions"
- os: osx
compiler: clang
env:
- ENV_CXX_FLAGS="-Wno-c99-extensions"

############################################################################
# POCL builds (OpenCL 1.0, 1.1)
Expand Down Expand Up @@ -239,10 +238,10 @@ before_install:
#sudo apt-get install -qq -y clang-3.7 libclang-common-3.7-dev libclang-3.7-dev libclang1-3.7 libllvm3.7 lldb-3.7 llvm-3.7 llvm-3.7-dev llvm-3.7-runtime clang-modernize-3.7 clang-format-3.7 lldb-3.7-dev
# OSX
elif [[ ${TRAVIS_OS_NAME} == "osx" ]]; then
brew update
brew outdated boost || brew upgrade boost
brew outdated cmake || brew upgrade cmake
brew install lcov opencv # FIXME: exit status 1 with no error message
# The macOS job runs the Java/Maven test suite. The Linux OpenCL/CMake
# bootstrap is not used here, and the old Homebrew OpenCV install was
# the reason this job was disabled.
true
fi
- gem install coveralls-lcov
- if [ "$CXX" = "g++" ]; then export CXX="g++-4.8" CC="gcc-4.8"; fi
Expand Down