diff options
| author | Garrett D'Amore <garrett@damore.org> | 2017-08-07 14:33:29 -0700 |
|---|---|---|
| committer | Garrett D'Amore <garrett@damore.org> | 2017-08-07 14:33:29 -0700 |
| commit | f673c88d25979c92a3cd8fda40a2312899cf1dac (patch) | |
| tree | 137942d01b4bdbb485893f57ee58664e9ea386e4 | |
| parent | 85d0caefd0ee35adef0df919c6f6094e679e85c8 (diff) | |
| download | nng-f673c88d25979c92a3cd8fda40a2312899cf1dac.tar.gz nng-f673c88d25979c92a3cd8fda40a2312899cf1dac.tar.bz2 nng-f673c88d25979c92a3cd8fda40a2312899cf1dac.zip | |
More coverage tweaks (I hope).
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | CMakeLists.txt | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml index 7aeb025a..a1bec539 100644 --- a/.travis.yml +++ b/.travis.yml @@ -53,8 +53,8 @@ matrix: # code coverage build - os: linux env: >- - CC=clang-4.0 - CXX=clang++-4.0 + CC=gcc-7 + CXX=g++-7 COVERAGE=ON BUILD_TYPE=Debug TEST_PARALLEL= diff --git a/CMakeLists.txt b/CMakeLists.txt index eb93bda2..376e77fd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -103,14 +103,14 @@ if (NNG_ENABLE_COVERAGE) # is older than that, you will need to find something newer. For # correct reporting, we always turn off all optimizations. if (CMAKE_C_COMPILER_ID STREQUAL "GNU") - set(CMAKE_C_FLAGS -g -O0 -fprofile-arcs -ftest-coverage) - set(CMAKE_CXX_FLAGS -g -O0 -fprofile-arcs -ftest-coverage) + set(CMAKE_C_FLAGS ${CMAKE_C_FLAGS} -g -O0 -fprofile-arcs -ftest-coverage) + set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} -g -O0 -fprofile-arcs -ftest-coverage) elseif (CMAKE_C_COMPILER_ID STREQUAL "Clang") - set(CMAKE_C_FLAGS -g -O0 -fprofile-arcs -ftest-coverage) - set(CMAKE_CXX_FLAGS -g -O0 -fprofile-arcs -ftest-coverage) + set(CMAKE_C_FLAGS ${CMAKE_C_FLAGS} -g -O0 -fprofile-arcs -ftest-coverage) + set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} -g -O0 -fprofile-arcs -ftest-coverage) elseif (CMAKE_COMPILER_ID STREQUAL "AppleClang") - set(CMAKE_C_FLAGS -g -O0 -fprofile-arcs -ftest-coverage) - set(CMAKE_CXX_FLAGS -g -O0 -fprofile-arcs -ftest-coverage) + set(CMAKE_C_FLAGS ${CMAKE_C_FLAGS} -g -O0 -fprofile-arcs -ftest-coverage) + set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} -g -O0 -fprofile-arcs -ftest-coverage) else() message(FATAL_ERROR "Unable to enable coverage for your compiler.") endif() |