From 3c2392a66c056cf531c8455ec1ed209d9c402d61 Mon Sep 17 00:00:00 2001 From: Harry van Haaren Date: Sun, 9 Apr 2017 16:10:27 +0100 Subject: [PATCH] cmake: update makefiles to not clobber flags vars, fixes #178 --- buildTest/compile.sh | 2 +- src/CMakeLists.txt | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/buildTest/compile.sh b/buildTest/compile.sh index 7fa0784..978aa77 100755 --- a/buildTest/compile.sh +++ b/buildTest/compile.sh @@ -13,7 +13,7 @@ set -e # setup environment: Copy material for tests to /tmp cp -r ../src/tests/lupppTestMaterial /tmp -rm CMakeCache.txt +rm -f CMakeCache.txt scan-build cmake -DBUILD_TESTS=1 ../ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 48596c6..7b44db1 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -40,14 +40,14 @@ IF(BUILD_TESTS) ADD_DEFINITIONS(-DBUILD_TESTS) ADD_DEFINITIONS(-DBUILD_COVERAGE_TEST) - SET(CMAKE_CXX_FLAGS " -g -Wall -Wextra -Wno-unused-variable -fprofile-arcs -ftest-coverage ") - SET(CMAKE_C_FLAGS " -g -Wall -Wextra -W -Wno-unused-variable -fprofile-arcs -ftest-coverage ") - SET(CMAKE_EXE_LINKER_FLAGS "-fprofile-arcs -ftest-coverage") + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -Wall -Wextra -Wno-unused-variable -fprofile-arcs -ftest-coverage ") + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -Wall -Wextra -W -Wno-unused-variable -fprofile-arcs -ftest-coverage ") + SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS}-fprofile-arcs -ftest-coverage") ENDIF(BUILD_TESTS) IF(RELEASE_BUILD) - SET(CMAKE_CXX_FLAGS " -g -Wall -Wno-unused-variable ") - SET(CMAKE_C_FLAGS " -g -Wall -W -Wno-unused-variable ") + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -Wall -Wno-unused-variable ") + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -Wall -W -Wno-unused-variable ") ENDIF(RELEASE_BUILD) if( ${ARCHITECTURE} STREQUAL "x86_64" )