X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0d56c9a185dd4cad84f2927417ad7125d0ffd15e..33000bf1ab61a3274200762ffb6f96098e0d5bd3:/buildtools/Cmake/Flags.cmake

diff --git a/buildtools/Cmake/Flags.cmake b/buildtools/Cmake/Flags.cmake
index 475da98f59..16aa5b7a42 100644
--- a/buildtools/Cmake/Flags.cmake
+++ b/buildtools/Cmake/Flags.cmake
@@ -17,9 +17,13 @@ if(enable_compile_warnings)
     if(COMPILER_C_VERSION_MAJOR_MINOR STRGREATER "4.5")
       set(warnCFLAGS "${warnCFLAGS}-Wno-error=unused-but-set-variable ")
     endif()
+    if(COMPILER_C_VERSION_MAJOR_MINOR STREQUAL "4.6")
+    #some old compilers emit bogus warnings here, see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=45978 . Avoid failing the build in this case
+      set(warnCFLAGS "${warnCFLAGS}-Wno-error=array-bounds")
+    endif()
   endif()
 
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wno-unused-function -Wno-unused-parameter -Wno-strict-aliasing -Wclobbered -Wno-error=clobbered -Wno-format-nonliteral -Werror")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra  -Wunused -Wpointer-arith -Wchar-subscripts -Wcomment -Wno-unknown-warning-option -Wformat -Wwrite-strings -Wno-unused-function -Wno-unused-parameter -Wno-strict-aliasing -Wclobbered -Wno-error=clobbered -Wno-format-nonliteral -Werror")
 
   set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -Wall") # FIXME: Q&D hack
 
@@ -27,8 +31,9 @@ if(enable_compile_warnings)
 endif()
 
 if(enable_compile_optimizations)
-  set(optCFLAGS "-O3 -finline-functions -funroll-loops -fno-strict-aliasing ")
+  set(optCFLAGS "-O3 -funroll-loops -fno-strict-aliasing ")
   if(CMAKE_COMPILER_IS_GNUCC AND (NOT enable_model-checking))
+    set(optCFLAGS "${optCFLAGS} -finline-functions ")
     if(WIN32)
       if (COMPILER_C_VERSION_MAJOR_MINOR STRGREATER "4.7")
       # On windows, we need 4.8 or higher to enable lto because of http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50293
@@ -50,11 +55,11 @@ if(enable_model-checking AND enable_compile_optimizations)
   set(optCFLAGS "-O0 ")
   # But you can still optimize this:
   foreach(s
-      src/xbt/mmalloc/mm.c
-      src/xbt/snprintf.c src/xbt/log.c
-      # For some reason, this fails to work when optimizing dynar.c:
+      # src/xbt/mmalloc/mm.c
+      # src/xbt/snprintf.c src/xbt/log.c
       # src/xbt/dynar.c
-      src/xbt/set.c src/xbt/setset.c src/xbt/backtrace_linux.c
+      # src/xbt/set.c src/xbt/setset.c
+      # src/xbt/backtrace_linux.c
       src/mc/mc_dwarf_expression.c src/mc/mc_dwarf.c src/mc/mc_member.c
       src/mc/mc_snapshot.c src/mc/mc_page_store.cpp src/mc/mc_page_snapshot.cpp
       src/mc/mc_compare.cpp src/mc/mc_diff.c
@@ -64,6 +69,11 @@ if(enable_model-checking AND enable_compile_optimizations)
   endforeach()
 endif()
 
+if(enable_mc_content_adressable_pages)
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DMC_PAGE_STORE_MD4")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DMC_PAGE_STORE_MD4")
+endif()
+
 if(APPLE AND COMPILER_C_VERSION_MAJOR_MINOR MATCHES "4.6")
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-deprecated-declarations")
   set(optCFLAGS "-O0 ")
@@ -71,13 +81,14 @@ endif()
 
 if(NOT enable_debug)
   set(CMAKE_C_FLAGS "-DNDEBUG ${CMAKE_C_FLAGS}")
+  set(CMAKE_CXX_FLAGS "-DNDEBUG ${CMAKE_CXX_FLAGS}")
 endif()
 
 if(enable_msg_deprecated)
   set(CMAKE_C_FLAGS "-DMSG_USE_DEPRECATED ${CMAKE_C_FLAGS}")
 endif()
 
-set(CMAKE_C_FLAGS "${optCFLAGS}${warnCFLAGS}${CMAKE_C_FLAGS}")
+set(CMAKE_C_FLAGS "${optCFLAGS} ${warnCFLAGS} ${CMAKE_C_FLAGS}")
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${optCFLAGS}")