we need std=gnu11 in C too (was std=gnu99)

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

diff --git a/buildtools/Cmake/Flags.cmake b/buildtools/Cmake/Flags.cmake
index 3fe0a43..b3dc837 100644 (file)
--- a/buildtools/Cmake/Flags.cmake
+++ b/buildtools/Cmake/Flags.cmake
@@ -1,40 +1,52 @@
 set(warnCFLAGS "")
 set(optCFLAGS "")
 
+##
+## Request full debugging flags
+##
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g3")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3")
+set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -g")
+
+##
+## We need a decent support of the c++11 standard
+##
 include(CheckCXXCompilerFlag)
-
-if(NOT __VISUALC__ AND NOT __BORLANDC__)
-  CHECK_CXX_COMPILER_FLAG("-std=gnu++11" HAVE_CXX11)
-  CHECK_CXX_COMPILER_FLAG("-std=gnu++0x" HAVE_CXX0X)
-  if(HAVE_CXX11)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11")
-  elseif(HAVE_CXX0X)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++0x")
-  else()
-    message(STATUS "Missing support for C++11.")
+CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)
+if(COMPILER_SUPPORTS_CXX11)
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+else()
+  message(FATAL_ERROR 
+          "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. "
+         "Please use a decent C++ compiler.")
+endif()
+if (CMAKE_COMPILER_IS_GNUCC)
+  if (COMPILER_CXX_VERSION_MAJOR_MINOR STRLESS "4.7")
+    message(FATAL_ERROR
+            "SimGrid needs g++ version 4.7 to compile "
+           "(c++11 support of previous versions is too limited).")
   endif()
 endif()
 
-if(NOT __VISUALC__ AND NOT __BORLANDC__)
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -g3")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3")
-  set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -g")
+###
+### And we need C11 standard, too
+###
+include(CheckCCompilerFlag)
+CHECK_C_COMPILER_FLAG("-std=gnu11" COMPILER_SUPPORTS_C11)
+if(COMPILER_SUPPORTS_C11)
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu11")
 else()
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}/Zi")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}/Zi")
+  message(FATAL_ERROR 
+          "The compiler ${CMAKE_C_COMPILER} has no C11 support. "
+         "Please use a decent C compiler "
+         "(note that c++11 support of ${CMAKE_CXX_COMPILER} seems ok).")
 endif()
 
+
 if(enable_compile_warnings)
   set(warnCFLAGS "-fno-common -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 ")
   if(CMAKE_COMPILER_IS_GNUCC)
     set(warnCFLAGS "${warnCFLAGS}-Wclobbered -Wno-error=clobbered ")
-    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  -Wunused -Wpointer-arith -Wchar-subscripts -Wcomment  -Wformat -Wwrite-strings -Wno-unused-function -Wno-unused-parameter -Wno-strict-aliasing -Wno-format-nonliteral -Werror")
@@ -58,7 +70,7 @@ if(enable_compile_optimizations)
       endif()
     else()    
       # On non-windows, 4.6 is enough for that
-      if(COMPILER_C_VERSION_MAJOR_MINOR STRGREATER "4.5" AND LINKER_VERSION STRGREATER "2.22")
+      if(LINKER_VERSION STRGREATER "2.22")
         set(optCFLAGS "${optCFLAGS} -flto ")
       endif()
     endif()
@@ -101,11 +113,6 @@ 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 ")