aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGarrett D'Amore <garrett@damore.org>2017-08-07 14:40:36 -0700
committerGarrett D'Amore <garrett@damore.org>2017-08-07 14:40:36 -0700
commit97bb0dbdb7db3e323142be4e9f6e2120570fd904 (patch)
treed8f09c1e5ebb3567bed47c384be7d5f56d0898ff
parentf673c88d25979c92a3cd8fda40a2312899cf1dac (diff)
downloadnng-97bb0dbdb7db3e323142be4e9f6e2120570fd904.tar.gz
nng-97bb0dbdb7db3e323142be4e9f6e2120570fd904.tar.bz2
nng-97bb0dbdb7db3e323142be4e9f6e2120570fd904.zip
Problem was module path override, I think.
-rw-r--r--CMakeLists.txt13
1 files changed, 6 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 376e77fd..6873e671 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,7 +33,6 @@ include (CheckStructHasMember)
include (CheckLibraryExists)
include (CheckCSourceCompiles)
include (GNUInstallDirs)
-set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
if (POLICY CMP0042)
# Newer cmake on MacOS should use @rpath
@@ -103,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 ${CMAKE_C_FLAGS} -g -O0 -fprofile-arcs -ftest-coverage)
- set(CMAKE_CXX_FLAGS ${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 ${CMAKE_C_FLAGS} -g -O0 -fprofile-arcs -ftest-coverage)
- set(CMAKE_CXX_FLAGS ${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 ${CMAKE_C_FLAGS} -g -O0 -fprofile-arcs -ftest-coverage)
- set(CMAKE_CXX_FLAGS ${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()