From 7a58a87859de8651fd849e5d746882fe21fe1275 Mon Sep 17 00:00:00 2001 From: Phenom Date: Sun, 4 Sep 2016 13:08:09 +0200 Subject: [PATCH] Add MacOS compilation test on Travis CI --- .travis.yml | 40 ++++++++++++++++++++++++++++++++-------- 1 file changed, 32 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 80b719c06..bae0f21c1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,13 +1,36 @@ -sudo: required -dist: trusty language: cpp -compiler: - - gcc +matrix: + include: + - os: linux + dist: trusty + sudo: required + compiler: gcc + - os: osx + osx_image: xcode6.2 + compiler: clang + sudo: false before_install: - - sudo apt-get update - - sudo apt-get install -y build-essential checkinstall cmake libavutil-dev libavcodec-dev libavformat-dev libbz2-dev libcurl4-openssl-dev libcv-dev libopencv-highgui-dev libhighgui-dev libgnome-keyring-dev libgstreamer-plugins-base0.10-dev libgstreamer0.10-dev libjasper-dev libjpeg-dev libmicrohttpd-dev libopencv-dev libprotobuf-dev libqt4-dev libspeex-dev libspeexdsp-dev libsqlite3-dev libssl-dev libswscale-dev libtbb-dev libtiff4-dev libupnp-dev libv4l-dev libxine-dev libxslt1-dev libxss-dev pkg-config protobuf-compiler python-dev qtmobility-dev + - if [ $TRAVIS_OS_NAME == linux ]; then sudo apt-get update; fi + - if [ $TRAVIS_OS_NAME == linux ]; then sudo apt-get install -y build-essential checkinstall cmake libavutil-dev libavcodec-dev libavformat-dev libbz2-dev libcurl4-openssl-dev libcv-dev libopencv-highgui-dev libhighgui-dev libgnome-keyring-dev libgstreamer-plugins-base0.10-dev libgstreamer0.10-dev libjasper-dev libjpeg-dev libmicrohttpd-dev libopencv-dev libprotobuf-dev libqt4-dev libspeex-dev libspeexdsp-dev libsqlite3-dev libssl-dev libswscale-dev libtbb-dev libtiff4-dev libupnp-dev libv4l-dev libxine-dev libxslt1-dev libxss-dev pkg-config protobuf-compiler python-dev qtmobility-dev; fi + + +# - if [ $TRAVIS_OS_NAME == osx ]; then xcode-select --install ; fi + - if [ $TRAVIS_OS_NAME == osx ]; then brew update ; fi +# - if [ $TRAVIS_OS_NAME == osx ]; then brew install qt55 openssl miniupnpc libmicrohttpd speex homebrew/science/opencv ffmpeg sqlcipher ; fi + - if [ $TRAVIS_OS_NAME == osx ]; then brew install qt55 openssl miniupnpc libmicrohttpd speex ffmpeg sqlcipher ; fi + - if [ $TRAVIS_OS_NAME == osx ]; then brew link --force qt55 ; fi +#Fix for opencv and numpy already installed by system + - if [ $TRAVIS_OS_NAME == osx ]; then rm '/usr/local/bin/f2py'; fi + - if [ $TRAVIS_OS_NAME == osx ]; then rm -r '/usr/local/lib/python2.7/site-packages/numpy'; fi + - if [ $TRAVIS_OS_NAME == osx ]; then brew install homebrew/science/opencv; fi + +# FIX: Now openssl is not linked in /usr/local/include and lib + - if [ $TRAVIS_OS_NAME == osx ]; then ln -s /usr/local/opt/openssl/include/* /usr/local/include/; fi + - if [ $TRAVIS_OS_NAME == osx ]; then ln -s /usr/local/opt/openssl/lib/*.a /usr/local/lib/; fi + - if [ $TRAVIS_OS_NAME == osx ]; then ln -s /usr/local/opt/openssl/lib/*.dylib /usr/local/lib/; fi + # - if [ $TRAVIS_OS_NAME == linux ]; then sudo apt-get update && sudo apt-get install -y llvm-3.4 llvm-3.4-dev; fi # - rvm use $RVM --install --binary --fuzzy # - gem update --system @@ -31,8 +54,9 @@ addons: before_script: - qmake QMAKE_CC=$CC QMAKE_CXX=$CXX CONFIG+=NO_SQLCIPHER CONFIG+=tests -#script: make -script: if [ "${COVERITY_SCAN_BRANCH}" != 1 ]; then make && tests/unittests/unittests >/dev/null 2>&1 ; fi +script: + - if [ $TRAVIS_OS_NAME == linux ] && [ "${COVERITY_SCAN_BRANCH}" != 1 ]; then make && tests/unittests/unittests >/dev/null 2>&1 ; fi + - if [ $TRAVIS_OS_NAME == osx ] && [ "${COVERITY_SCAN_BRANCH}" != 1 ]; then make -j 4 ; fi #after_success: