From bee83c20e96f95cbdcc319c89758ff9e00f81343 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Christophe=20Thi=C3=A9ry?= Date: Fri, 28 Oct 2011 12:11:38 +0200 Subject: [PATCH] valgrind.h causes a "variable unused but set" warning in gcc 4.6 --- buildtools/Cmake/Flags.cmake | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/buildtools/Cmake/Flags.cmake b/buildtools/Cmake/Flags.cmake index 983b40cce6..f1b7a7f415 100644 --- a/buildtools/Cmake/Flags.cmake +++ b/buildtools/Cmake/Flags.cmake @@ -10,12 +10,12 @@ else(NOT __VISUALC__ AND NOT __BORLANDC__) endif(NOT __VISUALC__ AND NOT __BORLANDC__) if(enable_compile_warnings) - set(warnCFLAGS "-Wall -Wunused -Wmissing-prototypes -Wmissing-declarations -Wpointer-arith -Wchar-subscripts -Wcomment -Wformat -Wwrite-strings -Wno-unused-function -Wno-unused-parameter -Wno-strict-aliasing -Wno-format-nonliteral -Werror ") + set(warnCFLAGS "-Wall -Wunused -Wmissing-prototypes -Wmissing-declarations -Wpointer-arith -Wchar-subscripts -Wcomment -Wformat -Wwrite-strings -Wclobbered -Wno-unused-function -Wno-unused-parameter -Wno-strict-aliasing -Wno-format-nonliteral -Werror ") endif(enable_compile_warnings) -#if(enable_compile_warnings AND COMPILER_C_VERSION_MAJOR_MINOR MATCHES "4.6") -# set(warnCFLAGS "${warnCFLAGS} -Wno-error=unused-but-set-variable ") -#endif(enable_compile_warnings AND COMPILER_C_VERSION_MAJOR_MINOR MATCHES "4.6") +if(COMPILER_C_VERSION_MAJOR_MINOR STRGREATER "4.5") + set(warnCFLAGS "${warnCFLAGS} -Wno-unused-but-set-variable ") +endif(COMPILER_C_VERSION_MAJOR_MINOR STRGREATER "4.5") if(enable_compile_optimizations) set(optCFLAGS "-O3 -finline-functions -funroll-loops -fno-strict-aliasing ") @@ -54,6 +54,6 @@ if(enable_coverage) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-arcs -ftest-coverage") set(TESH_OPTION --enable-coverage) add_definitions(-fprofile-arcs -ftest-coverage) - endif(GCOV_PATH) + endif(GCOV_PATH) endif(enable_coverage) -- 2.20.1