From faf5b15d1f286aae76eb601089afcae62a6407d6 Mon Sep 17 00:00:00 2001 From: Navarrop Date: Fri, 24 Jun 2011 11:26:32 +0200 Subject: [PATCH] Add flag -Wno-error=unused-but-set-variable to enable_compile_warnings with gcc4.6 --- buildtools/Cmake/Flags.cmake | 19 +++++++++---------- buildtools/pipol/deploy.sh | 2 +- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/buildtools/Cmake/Flags.cmake b/buildtools/Cmake/Flags.cmake index 5fb9835883..102dab0e07 100644 --- a/buildtools/Cmake/Flags.cmake +++ b/buildtools/Cmake/Flags.cmake @@ -12,16 +12,15 @@ 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 ") endif(enable_compile_warnings) -if(APPLE AND COMPILER_C_VERSION_MAJOR_MINOR MATCHES "4.6") - message(STATUS "With gcc 4.6 and OSX compile optimizations is disable") - set(optCFLAGS "-O0 ") -else(APPLE AND COMPILER_C_VERSION_MAJOR_MINOR MATCHES "4.6") - if(enable_compile_optimizations) - set(optCFLAGS "-O3 -finline-functions -funroll-loops -fno-strict-aliasing ") - else(enable_compile_optimizations) - set(optCFLAGS "-O0 ") - endif(enable_compile_optimizations) -endif(APPLE AND COMPILER_C_VERSION_MAJOR_MINOR MATCHES "4.6") +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(enable_compile_optimizations) + set(optCFLAGS "-O3 -finline-functions -funroll-loops -fno-strict-aliasing ") +else(enable_compile_optimizations) + set(optCFLAGS "-O0 ") +endif(enable_compile_optimizations) if(NOT enable_debug) set(CMAKE_C_FLAGS "-DNDEBUG ${CMAKE_C_FLAGS}") diff --git a/buildtools/pipol/deploy.sh b/buildtools/pipol/deploy.sh index 785475db5e..aea016b76b 100644 --- a/buildtools/pipol/deploy.sh +++ b/buildtools/pipol/deploy.sh @@ -33,7 +33,7 @@ ssh pipol pipol-sub esn amd64_kvm-linux-debian-testing none 02:00 "~/Experimenta #___________________________________________________________________________________________________ #MacOS Snow Leopard 10.6____________________________________________________________________________ #ssh pipol pipol-sub esn x86_64_mac-mac-osx-server-snow-leopard.dd.gz none 02:00 "~/Experimental_bindings.sh" # PASSE PAS -ssh pipol pipol-sub esn x86_mac-mac-osx-server-snow-leopard.dd.gz none 02:00 "~/Experimental_bindings.sh" +ssh pipol pipol-sub esn x86_mac-mac-osx-server-snow-leopard-navarro-2011-06-22-203726.dd.gz none 02:00 "~/Experimental_bindings.sh" #___________________________________________________________________________________________________ #windows-server-2008-64bits_________________________________________________________________________ -- 2.20.1