From 42de1557b2386c4082cb76fa81531728b41046c7 Mon Sep 17 00:00:00 2001 From: Daniel Evers Date: Mon, 28 Jan 2019 11:12:38 +0100 Subject: [PATCH] need to override CMAKE vars before building --- .travis.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index bf52446b..d7d80056 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,12 +38,11 @@ before_script: sudo apt-get install python-pyparsing; fi - if [[ "$CXX" = "g++" && "$CONFIG" = "Debug" && "$TRAVIS_OS_NAME" = "linux" ]]; then export CXXFLAGS="--coverage"; fi - - cmake .. -DCMAKE_BUILD_TYPE=$CONFIG -DCMAKE_PREFIX_PATH=$PWD/../date + - if [[ -n "${TESTS_CXX_STD:-}" ]]; then ADD_OPTS="-DSQLPP11_TESTS_CXX_STD=$TESTS_CXX_STD"; fi + - cmake .. -DCMAKE_BUILD_TYPE=$CONFIG -DCMAKE_PREFIX_PATH=$PWD/../date $ADD_OPTS script: - - ARGS="--config $CONFIG" - - if [[ -n "${TESTS_CXX_STD:-}" ]]; then ARGS="$ARGS -DSQLPP11_TESTS_CXX_STD=$TESTS_CXX_STD"; fi - - cmake --build . $ARGS + - cmake --build . --config $CONFIG - ctest --output-on-failure after_script: