Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot//simgrid/simgrid

[simgrid.git] / buildtools / Cmake / Flags.cmake

diff --git a/buildtools/Cmake/Flags.cmake b/buildtools/Cmake/Flags.cmake
index a87ec9e..a69b065 100644 (file)
--- a/buildtools/Cmake/Flags.cmake
+++ b/buildtools/Cmake/Flags.cmake
@@ -20,9 +20,9 @@ endif(enable_compile_warnings)
 
 if(enable_compile_optimizations)
        set(optCFLAGS "-O3 -finline-functions -funroll-loops -fno-strict-aliasing ")
-       if(${COMPILER_C_VERSION_MAJOR_MINOR} STRGREATER "4.5")
+       if(COMPILER_C_VERSION_MAJOR_MINOR STRGREATER "4.5")
            set(optCFLAGS "${optCFLAGS}-flto ")
-       endif(${COMPILER_C_VERSION_MAJOR_MINOR} STRGREATER "4.5")
+       endif(COMPILER_C_VERSION_MAJOR_MINOR STRGREATER "4.5")
 else(enable_compile_optimizations)
         set(optCFLAGS "-O0 ")
 endif(enable_compile_optimizations)
@@ -33,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}")