remove some more cruft related to gcc v4.6 (we request v4.7)

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

diff --git a/buildtools/Cmake/Flags.cmake b/buildtools/Cmake/Flags.cmake
index 6df76eb..8072d1d 100644 (file)
--- a/buildtools/Cmake/Flags.cmake
+++ b/buildtools/Cmake/Flags.cmake
@@ -1,32 +1,15 @@
-set(warnCFLAGS "")
-set(optCFLAGS "")
-
 ##
-## Request full debugging flags
+## This file is in charge of setting our paranoid flags with regard to warnings and optimization.
 ##
-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")
+##   These flags do break some classical CMake tests, so you don't
+##   want to do so before the very end of the configuration.
+## 
+##   Other compiler flags (C/C++ standard version) are tested and set
+##   by the beginning of the configuration, directly in ~/CMakeList.txt
+
+set(warnCFLAGS "")
+set(optCFLAGS "")
 
-##
-## We need a decent support of the c++11 standard
-##
-include(CheckCXXCompilerFlag)
-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_C_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(enable_compile_warnings)
@@ -39,9 +22,11 @@ if(enable_compile_warnings)
   if(CMAKE_COMPILER_IS_GNUCXX)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wclobbered -Wno-error=clobbered")
   endif()
+  if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") # don't care about class that become struct
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-mismatched-tags")
+  endif()
 
-  set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -Wall") # FIXME: Q&D hack
-
+  set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -Wall")
   set(CMAKE_JAVA_COMPILE_FLAGS "-Xlint")
 endif()
 
@@ -99,11 +84,6 @@ if(enable_model-checking AND enable_compile_optimizations)
   endforeach()
 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 ")
-endif()
-
 if(NOT enable_debug)
   set(CMAKE_C_FLAGS "-DNDEBUG ${CMAKE_C_FLAGS}")
   set(CMAKE_CXX_FLAGS "-DNDEBUG ${CMAKE_CXX_FLAGS}")
@@ -113,8 +93,7 @@ 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   "${CMAKE_C_FLAGS}   ${optCFLAGS} ${warnCFLAGS}")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${optCFLAGS}")
 
 # Try to make Mac a bit more complient to open source standards