X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9a6fdb6c8b701fd2604dc02d86a28dd596e70188..faf5b15d1f286aae76eb601089afcae62a6407d6:/buildtools/Cmake/Flags.cmake

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}")