X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2fa2a6ce966b1ceb2327ea00f7e4073ceba55175..83d5e2d22bef35118f8f8f5bcb506830b687690b:/buildtools/Cmake/Flags.cmake

diff --git a/buildtools/Cmake/Flags.cmake b/buildtools/Cmake/Flags.cmake
index 95b1ae5717..c954d2ed62 100644
--- a/buildtools/Cmake/Flags.cmake
+++ b/buildtools/Cmake/Flags.cmake
@@ -3,25 +3,33 @@ set(optCFLAGS "")
 
 if(NOT __VISUALC__ AND NOT __BORLANDC__)
 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-g3")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}-g3")
 else(NOT __VISUALC__ AND NOT __BORLANDC__)
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}/Zi")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}/Zi")
 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 -Werror=clobbered -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 ")
+    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)
 
+if(APPLE AND COMPILER_C_VERSION_MAJOR_MINOR MATCHES "4.6")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-deprecated-declarations")	    
+    set(optCFLAGS "-O0 ")
+endif(APPLE AND COMPILER_C_VERSION_MAJOR_MINOR MATCHES "4.6")
+
 if(NOT enable_debug)
 		set(CMAKE_C_FLAGS "-DNDEBUG ${CMAKE_C_FLAGS}")
 endif(NOT enable_debug)
@@ -29,23 +37,22 @@ endif(NOT enable_debug)
 set(CMAKE_C_FLAGS "${optCFLAGS}${warnCFLAGS}${CMAKE_C_FLAGS}")
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${custom_flags}")
-
-if(HAVE_PCRE_LIB AND WIN32)
-       set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DPCRE_STATIC")
-endif(HAVE_PCRE_LIB AND WIN32)
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${optCFLAGS}")
 
 # Try to make Mac a bit more complient to open source standards
 if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_XOPEN_SOURCE")
 endif(CMAKE_SYSTEM_NAME MATCHES "Darwin")
 
+set(TESH_OPTION "")
 if(enable_coverage)
 	find_program(GCOV_PATH gcov)
 	if(GCOV_PATH)
 		SET(COVERAGE_COMMAND "${GCOV_PATH}" CACHE TYPE FILEPATH FORCE)
 		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fprofile-arcs -ftest-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)