From f2f50971642fc719f5f5fd19c7734fb154bdc1a0 Mon Sep 17 00:00:00 2001 From: Thomas Fussell Date: Mon, 31 Oct 2016 23:30:21 -0400 Subject: [PATCH] fix coveralls call and ignore unknown pragmas --- .travis.yml | 2 +- source/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index e12c55ed..32dd49d2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,4 +50,4 @@ script: - cd bin && ./xlnt.test - cd .. - find source/CMakeFiles/xlnt.dir - - if [ "$COMPILER" = "g++4.9" ]; then coveralls --root source/CMakeFiles/xlnt.dir --verbose -x ".cpp" --gcov-options '\-p' + - if [ "$COMPILER" = "g++4.9" ]; then coveralls --root source/CMakeFiles/xlnt.dir --verbose -x ".cpp" --gcov-options '\-p' ; fi diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index 7e925dbe..6653b2a8 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -54,7 +54,7 @@ endif() if(MSVC) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4") elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wno-unknown-pragmas") elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Weverything -Wno-c++98-compat -Wno-padded") endif()