From e2eb98e8c9cf5887c245fc4f2f706d0b61649253 Mon Sep 17 00:00:00 2001 From: Thomas Fussell Date: Sat, 21 Nov 2015 10:57:45 -0500 Subject: [PATCH] fix travis --- .travis.yml | 4 ++-- cmake/CMakeLists.txt | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3494cb6f..14340179 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,8 +40,8 @@ script: after_success: - if [ "$COMPILER" = "g++-4.9" ]; then rm -rf ./* ; fi - - if [ "$COMPILER" = "g++-4.9" ]; then cmake -G "Unix Makefiles" -D SHARED=1 -D BUILD_TESTS=1 -D CMAKE_CXX_COMPILER=$COMPILER -D CMAKE_CXX_FLAGS="-fprofile-arcs -ftest-coverage" ../cmake ; fi - - if [ "$COMPILER" = "g++-4.9" ]; then make ; fi + - if [ "$COMPILER" = "g++-4.9" ]; then cmake -G "Unix Makefiles" -D DEBUG=1 -D COVERAGE=1 -D SHARED=0 -D STATIC=1 -D BUILD_TESTS=1 -D CMAKE_CXX_COMPILER=$COMPILER ../cmake ; fi + - if [ "$COMPILER" = "g++-4.9" ]; then make VERBOSE=1 ; fi - if [ "$COMPILER" = "g++-4.9" ]; then cd .. && ./bin/xlnt.test ; fi - if [ "$COMPILER" = "g++-4.9" ]; then coveralls --exclude bin --exclude build --exclude cmake --exclude docs --exclude include --exclude lib --exclude samples --include source --exclude tests --exclude third-party --gcov-options '\-lp' --gcov 'gcov-4.9' ; fi diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index c14d43b2..64ff5f35 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -13,6 +13,10 @@ option(BUILD_EXAMPLES "Build examples" OFF) option(BUILD_TESTS "Build tests runner" OFF) option(COVERAGE "Create coverage files" OFF) +if(COVERAGE) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-arcs -ftest-coverage") +endif() + if(${CMAKE_GENERATOR} STREQUAL "Unix Makefiles") if(DEBUG) set(CMAKE_BUILD_TYPE "Debug")