Require g++ v4.7 at least to not speak prehistorical C++

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

diff --git a/buildtools/Cmake/Flags.cmake b/buildtools/Cmake/Flags.cmake
index e51d603..09753b0 100644 (file)
--- a/buildtools/Cmake/Flags.cmake
+++ b/buildtools/Cmake/Flags.cmake
@@ -3,6 +3,12 @@ set(optCFLAGS "")
 
 include(CheckCXXCompilerFlag)
 
+if (CMAKE_COMPILER_IS_GNUCC)
+  if (COMPILER_C_VERSION_MAJOR_MINOR STRLESS "4.7")
+    message(FATAL_ERROR "SimGrid needs g++ version 4.7 to compile.")
+  endif()
+endif()
+
 if(NOT __VISUALC__ AND NOT __BORLANDC__)
   CHECK_CXX_COMPILER_FLAG("-std=gnu++11" HAVE_CXX11)
   CHECK_CXX_COMPILER_FLAG("-std=gnu++0x" HAVE_CXX0X)
@@ -11,7 +17,7 @@ if(NOT __VISUALC__ AND NOT __BORLANDC__)
   elseif(HAVE_CXX0X)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++0x")
   else()
-    message(STATUS "Missing support for C++11.")
+    message(FATAL_ERROR "Missing support for C++11.")
   endif()
 endif()
 
@@ -28,13 +34,6 @@ 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 +57,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 +100,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 ")
@@ -126,7 +120,7 @@ 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")
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_XOPEN_SOURCE=700 -D_DARWIN_C_SOURCE")
 endif()
 
 set(TESH_OPTION "")