diff options
| author | Niall Douglas (s [underscore] sourceforge {at} nedprod [dot] com) <spamtrap@nedprod.com> | 2018-01-31 22:13:13 +0300 |
|---|---|---|
| committer | Niall Douglas (s [underscore] sourceforge {at} nedprod [dot] com) <spamtrap@nedprod.com> | 2018-01-31 22:13:13 +0300 |
| commit | 4a085fe8d6ab9322358d0c598c793c0fb4fc90aa (patch) | |
| tree | a0b222cba6b75130c28665d367b5f0f17d740512 /.travis.yml | |
| parent | a5a6d3c224b276c76a9c9c56edeae2794922c198 (diff) | |
Fix build breakage on POSIX hopefully
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/.travis.yml b/.travis.yml index 4679d60f..49b3a0dd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,8 @@ dist: trusty language: cpp compiler: - - g++-7 - - clang-4.0 + - g++ + - clang++ sudo: false os: - linux @@ -35,18 +35,23 @@ env: - secure: "A3TeWTlJdjUaQ31NF60kMOik8mzaJkdKA55jZXjN83BJ2ZjMDmWfq1XmZ7iDIxmn7HC2BVpjhdkj9jpRtPztb08L5VSlJIiVbXlBWNwgzmYANujpR9rA+bhZJwlKDaYQHUZUd4+iGHCHb0dLt2HG0eHF5azaifd0YqCfz5GcWl8=" matrix: - __="cmake tests" NAME=TravisLinuxWorker + - __="cmake tests" NAME=TravisOSXWorker - __="Documentation" NAME=TravisDocumentation - __="Programs" matrix: exclude: - os: osx - compiler: g++-7 - - os: linux - compiler: clang-4.0 + compiler: g++ + - os: osx env: __="Documentation" NAME=TravisDocumentation - os: osx + env: __="cmake tests" NAME=TravisLinuxWorker + - os: linux + compiler: clang++ env: __="Documentation" NAME=TravisDocumentation + - os: linux + env: __="cmake tests" NAME=TravisOSXWorker cache: apt: true @@ -67,11 +72,13 @@ before_install: - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then brew install llvm; - export NAME=TravisOSXWorker; export CXX=/usr/local/opt/llvm/bin/clang++; export LDFLAGS="-L/usr/local/opt/llvm/lib -Wl,-rpath,/usr/local/opt/llvm/lib"; export CPPFLAGS=-I/usr/local/opt/llvm/include; + export CMAKE_FLAGS=-DCMAKE_LIBRARY_PATH=/usr/local/opt/llvm/lib; fi + - if [ "$CXX" = "g++" ]; then export CXX=g++-7; export NAME=TravisLinuxWorkerGCC; fi; + - if [ "$CXX" = "clang++" ]; then export CXX=clang++-4.0; export NAME=TravisLinuxWorkerClang; fi; - git checkout develop - git submodule update --init --recursive - mount @@ -79,9 +86,7 @@ before_install: script: - if [ "$__" = "cmake tests" ]; then - if [ "$CXX" = "g++" ]; then export CXX=g++-7; export NAME=TravisLinuxWorkerGCC; fi; - if [ "$CXX" = "clang++" ]; then export CXX=clang++-4.0; export NAME=TravisLinuxWorkerClang; fi; - ctest -S .ci.cmake -V --timeout 300; + ctest -S .ci.cmake -V --timeout 300 ${CMAKE_FLAGS}; fi - if [ "$__" = "Documentation" ]; then @@ -100,12 +105,10 @@ script: fi - if [ "$__" = "Programs" ]; then - if [ "$CXX" = "g++" ]; then export CXX=g++-7; export NAME=TravisLinuxWorkerGCC; fi; - if [ "$CXX" = "clang++" ]; then export CXX=clang++-4.0; export NAME=TravisLinuxWorkerClang; fi; cd programs; mkdir build; cd build; - cmake ..; + cmake .. ${CMAKE_FLAGS}; cmake --build .; fi |