aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGarrett D'Amore <garrett@damore.org>2017-08-07 15:04:45 -0700
committerGarrett D'Amore <garrett@damore.org>2017-08-07 15:04:45 -0700
commitd92b56d66320433387645510b0a9bd5364043f46 (patch)
tree8f17523cac48cea6584793f19245840fe5af674c
parent97bb0dbdb7db3e323142be4e9f6e2120570fd904 (diff)
downloadnng-d92b56d66320433387645510b0a9bd5364043f46.tar.gz
nng-d92b56d66320433387645510b0a9bd5364043f46.tar.bz2
nng-d92b56d66320433387645510b0a9bd5364043f46.zip
Compiler switches need to be a string.
-rw-r--r--.travis.yml2
-rw-r--r--CMakeLists.txt12
2 files changed, 7 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml
index a1bec539..e5aa1843 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -57,7 +57,7 @@ matrix:
CXX=g++-7
COVERAGE=ON
BUILD_TYPE=Debug
- TEST_PARALLEL=
+ TEST_PARALLEL=-j1
CLANG_FORMAT=no
# One MacOS X build
- os: osx
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6873e671..529e5f48 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -102,14 +102,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 "-g -O0 -fprofile-arcs -ftest-coverage")
+ set(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 "-g -O0 -fprofile-arcs -ftest-coverage")
+ set(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 "-g -O0 -fprofile-arcs -ftest-coverage")
+ set(CMAKE_CXX_FLAGS "-g -O0 -fprofile-arcs -ftest-coverage")
else()
message(FATAL_ERROR "Unable to enable coverage for your compiler.")
endif()