X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f783ed4680c6862a1b7543237e89d1221334bae0..41dc0d03d65ec6d89569d47d3a335d84b0ba927e:/buildtools/Cmake/Flags.cmake

diff --git a/buildtools/Cmake/Flags.cmake b/buildtools/Cmake/Flags.cmake
index 41e84a0ddd..e6d51d336f 100644
--- a/buildtools/Cmake/Flags.cmake
+++ b/buildtools/Cmake/Flags.cmake
@@ -10,15 +10,19 @@ 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 ")
+    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(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 ")
+	if(COMPILER_C_VERSION_MAJOR_MINOR STRGREATER "4.5")
+	    set(optCFLAGS "${optCFLAGS}-flto ")
+	endif(COMPILER_C_VERSION_MAJOR_MINOR STRGREATER "4.5")
 else(enable_compile_optimizations)
         set(optCFLAGS "-O0 ")
 endif(enable_compile_optimizations)
@@ -29,12 +33,15 @@ 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}")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${optCFLAGS}")
 
 # Try to make Mac a bit more complient to open source standards
@@ -51,6 +58,19 @@ 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)
 
+if(NOT $ENV{CFLAGS} STREQUAL "")
+    message(STATUS "Add CFLAGS: \"$ENV{CFLAGS}\" to CMAKE_C_FLAGS")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} $ENV{CFLAGS}")
+endif(NOT $ENV{CFLAGS} STREQUAL "")
+
+if(NOT $ENV{LDFLAGS} STREQUAL "")
+    message(STATUS "Add LDFLAGS: \"$ENV{LDFLAGS}\" to CMAKE_C_LINK_FLAGS")
+    set(CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} $ENV{LDFLAGS}")
+endif(NOT $ENV{LDFLAGS} STREQUAL "")
+
+if(enable_model-checking AND enable_compile_optimizations)
+    message(WARNING "Sorry for now GCC optimizations does not work with model checking.\nPlease turn off optimizations with command:\ncmake -Denable_compile_optimizations=off. ")
+endif(enable_model-checking AND enable_compile_optimizations)