travis: cmake options implicitly set to OFF when not specified

This commit is contained in:
Hugues Delorme 2016-01-14 09:36:36 +01:00
parent 332edde857
commit 6ed9a870b4
2 changed files with 22 additions and 17 deletions

View File

@ -15,26 +15,26 @@ matrix:
include:
# Linux GCC-4.6 debug static coveralls
- compiler: gcc
env: TRAVIS_BUILD_TYPE=Debug TRAVIS_SHARED_LIBS=OFF TRAVIS_STRICT_C90=OFF TRAVIS_MAKE_CHECK=ON TRAVIS_COVERALLS=ON
env: TRAVIS_BUILD_TYPE=Debug TRAVIS_COVERALLS=ON
# Linux GCC-4.6 debug dll c90
- compiler: gcc
env: TRAVIS_BUILD_TYPE=Debug TRAVIS_SHARED_LIBS=ON TRAVIS_STRICT_C90=ON TRAVIS_MAKE_CHECK=ON TRAVIS_COVERALLS=OFF
env: TRAVIS_BUILD_TYPE=Debug TRAVIS_SHARED_LIBS=ON TRAVIS_STRICT_C90=ON
# Linux GCC-4.9 release static
- compiler: gcc-4.9
addons: *gcc49-packages
env: TRAVIS_BUILD_TYPE=Release TRAVIS_SHARED_LIBS=OFF TRAVIS_STRICT_C90=OFF TRAVIS_MAKE_CHECK=ON TRAVIS_COVERALLS=OFF TRAVIS_GCC_VERSION=4.9
env: TRAVIS_BUILD_TYPE=Release TRAVIS_GCC_VERSION=4.9
# OSX Clang debug static
- os: osx
compiler: clang
env: TRAVIS_BUILD_TYPE=Debug TRAVIS_SHARED_LIBS=OFF TRAVIS_STRICT_C90=OFF TRAVIS_MAKE_CHECK=ON TRAVIS_COVERALLS=OFF
env: TRAVIS_BUILD_TYPE=Debug
# OSX Clang debug dll c90
- os: osx
compiler: clang
env: TRAVIS_BUILD_TYPE=Debug TRAVIS_SHARED_LIBS=ON TRAVIS_STRICT_C90=ON TRAVIS_MAKE_CHECK=ON TRAVIS_COVERALLS=OFF
env: TRAVIS_BUILD_TYPE=Debug TRAVIS_SHARED_LIBS=ON TRAVIS_STRICT_C90=ON
# OSX Clang release static
- os: osx
compiler: clang
env: TRAVIS_BUILD_TYPE=Release TRAVIS_SHARED_LIBS=OFF TRAVIS_STRICT_C90=OFF TRAVIS_MAKE_CHECK=ON TRAVIS_COVERALLS=OFF
env: TRAVIS_BUILD_TYPE=Release
script:
- chmod +x travis-build-script.sh

View File

@ -15,15 +15,24 @@ else
fi
echo TRAVIS_COVERALLS=$TRAVIS_COVERALLS
# CMake
# CMake options as environment variables
if [ -n "${TRAVIS_GCC_VERSION}" ]; then
export CC=gcc-$TRAVIS_GCC_VERSION;
export CXX=g++-$TRAVIS_GCC_VERSION;
fi
if [ -z "${TRAVIS_SHARED_LIBS}" ]; then
export TRAVIS_SHARED_LIBS=OFF;
fi
if [ -z "${TRAVIS_STRICT_C90}" ]; then
export TRAVIS_STRICT_C90=OFF;
fi
# Run CMake
mkdir build && cd build
cmake --version
if [ -n "${TRAVIS_GCC_VERSION}" ]; then
export CC=gcc-4.9;
export CXX=g++-4.9;
fi
cmake .. -G "Unix Makefiles" \
-DCMAKE_DEBUG_POSTFIX=_d \
-DCMAKE_BUILD_TYPE=$TRAVIS_BUILD_TYPE \
@ -36,11 +45,7 @@ cmake .. -G "Unix Makefiles" \
# Make
make -j4
make install
# Run unit tests
if [ "${TRAVIS_MAKE_CHECK}" = "ON" ]; then
make check;
fi
make check # Unit tests
# Coveralls
if [ "${TRAVIS_COVERALLS}" = "ON" ]; then