Enable clobbered variable warnings again and fix the last one (for me)

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

diff --git a/buildtools/Cmake/Flags.cmake b/buildtools/Cmake/Flags.cmake
index 180fcd2..51c0ef8 100644 (file)
--- a/buildtools/Cmake/Flags.cmake
+++ b/buildtools/Cmake/Flags.cmake
@@ -3,34 +3,57 @@ 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 ")
 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")
+           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(enable_debug)
+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(enable_debug)
+endif(NOT enable_debug)
 
 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
+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)