Another attempt to fix Travis config for clang.

This commit is contained in:
Alek Mosingiewicz 2018-08-19 13:21:10 +02:00
parent 4f35a6144c
commit 866045b158

View File

@ -40,11 +40,11 @@ matrix:
- os: osx - os: osx
compiler: clang compiler: clang
osx_image: xcode9.4 osx_image: xcode9.4
env: COMPILER="clang-6.0" env: CLANGCC="clang-6.0" CLANGCXX="clang++-6.0" CMAKE_OPTIONS="-stdlib=libc++"
- os: osx - os: osx
compiler: clang compiler: clang
osx_image: xcode9.4 osx_image: xcode9.4
env: CMAKE_OPTIONS="-D DYNLOAD_ENABLED:BOOL=FALSE -D MULTITHREAD_SUPPORT_ENABLED:BOOL=FALSE -D USE_STD_MAKE_SHARED:BOOL=TRUE" BUILD_ONLY=1 env: CLANGCC="clang-6.0" CLANGCXX="clang++-6.0" CMAKE_OPTIONS="-D DYNLOAD_ENABLED:BOOL=FALSE -D MULTITHREAD_SUPPORT_ENABLED:BOOL=FALSE -D USE_STD_MAKE_SHARED:BOOL=TRUE -stdlib=libc++" BUILD_ONLY=1
env: env:
global: global:
@ -54,7 +54,8 @@ env:
before_install: before_install:
- if [ "${GCC_VER}" != "" ]; then export CXX="g++-$GCC_VER" CC="gcc-$GCC_VER" GCOV="gcov-$GCC_VER" ; fi - if [ "${GCC_VER}" != "" ]; then export CXX="g++-$GCC_VER" CC="gcc-$GCC_VER" GCOV="gcov-$GCC_VER" ; fi
- if [ "${COMPILER}" != "" ]; then export CXX="$COMPILER" CC="$COMPILER" ; fi - if [ "${CLANGCC}" != "" ]; then export CC="$CLANGCC" ; fi
- if [ "${CLANGXX}" != "" ]; then export CXX="$CLANGXX" ; fi
- pip install --user cpp-coveralls - pip install --user cpp-coveralls
script: script: