X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/10beade7f2e5b5b7f318c3847602cc1ddbf09c99..fdee9639e4620a7eee7e7e1b39443df01f4886cf:/buildtools/Cmake/Flags.cmake

diff --git a/buildtools/Cmake/Flags.cmake b/buildtools/Cmake/Flags.cmake
index 51c0ef8d77..b5dcd8019d 100644
--- a/buildtools/Cmake/Flags.cmake
+++ b/buildtools/Cmake/Flags.cmake
@@ -10,13 +10,14 @@ 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 -Werror=clobbered -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 ")
+    if(COMPILER_C_VERSION_MAJOR_MINOR STRGREATER "4.5")
+        set(warnCFLAGS "${warnCFLAGS} -Wno-error=unused-but-set-variable ")
+    else(COMPILER_C_VERSION_MAJOR_MINOR STRGREATER "4.5")
+        set(warnCFLAGS "${warnCFLAGS} -Wno-error=clobbered ")
+    endif(COMPILER_C_VERSION_MAJOR_MINOR STRGREATER "4.5")
 endif(enable_compile_warnings)
 
-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 ")
 	if(${COMPILER_C_VERSION_MAJOR_MINOR} STRGREATER "4.5")
@@ -32,9 +33,13 @@ if(APPLE AND COMPILER_C_VERSION_MAJOR_MINOR MATCHES "4.6")
 endif(APPLE AND COMPILER_C_VERSION_MAJOR_MINOR MATCHES "4.6")
 
 if(NOT enable_debug)
-		set(CMAKE_C_FLAGS "-DNDEBUG ${CMAKE_C_FLAGS}")
+    set(CMAKE_C_FLAGS "-DNDEBUG ${CMAKE_C_FLAGS}")
 endif(NOT enable_debug)
 
+if(enable_msg_deprecated)
+    set(CMAKE_C_FLAGS "-DMSG_USE_DEPRECATED ${CMAKE_C_FLAGS}")
+endif(enable_msg_deprecated)
+
 set(CMAKE_C_FLAGS "${optCFLAGS}${warnCFLAGS}${CMAKE_C_FLAGS}")
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${custom_flags}")