From 072f836a58bd25ed6b3a37e3fb14260358f35f01 Mon Sep 17 00:00:00 2001 From: Michael Carlberg Date: Sat, 29 Oct 2016 06:58:04 +0200 Subject: [PATCH] fix(ci): Update build script --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0b5d74de..c83e0504 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ language: cpp compiler: - clang -# - gcc + - gcc addons: apt: @@ -88,8 +88,8 @@ install: # Set compiler's #--------------------------------------------------------------------------x - - if [[ "${CXX}" == "clang++" ]]; then export CXX="clang++-3.8" CC="clang-3.8"; fi -# - if [[ "${CXX}" == "g++" ]]; then export CXX="g++-5" CC="gcc-5"; fi + - if [[ "${CXX}" == "clang++" ]]; then export CXX="clang++-3.8" CC="clang-3.8" CXXFLAGS="${CXXFLAGS} -Qunused-arguments"; fi + - if [[ "${CXX}" == "g++" ]]; then export CXX="g++-5" CC="gcc-5"; fi before_script: - eval "${CXX} --version" @@ -97,7 +97,7 @@ before_script: - cmake --version - mkdir -p "${TRAVIS_BUILD_DIR}/build" - cd "${TRAVIS_BUILD_DIR}/build" - - cmake -DCMAKE_C_COMPILER="${CC}" -DCMAKE_CXX_COMPILER="${CXX}" -DCMAKE_CXX_FLAGS="${CXXFLAGS}" -DCMAKE_BUILD_TYPE="${BUILD_TYPE}" -DENABLE_CCACHE=OFF .. + - cmake -DCMAKE_C_COMPILER="${CC}" -DCMAKE_CXX_COMPILER="${CXX}" -DCMAKE_CXX_FLAGS="${CXXFLAGS}" -DCMAKE_BUILD_TYPE="${BUILD_TYPE}" .. script: make