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 f42cc80..8072d1d 100644 (file)
--- a/buildtools/Cmake/Flags.cmake
+++ b/buildtools/Cmake/Flags.cmake
@@ -26,8 +26,7 @@ if(enable_compile_warnings)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-mismatched-tags")
   endif()
 
     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()
 
   set(CMAKE_JAVA_COMPILE_FLAGS "-Xlint")
 endif()
 


@@ -85,11 +84,6 @@ if(enable_model-checking AND enable_compile_optimizations)
   endforeach()
 endif()
 
   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}")
 if(NOT enable_debug)
   set(CMAKE_C_FLAGS "-DNDEBUG ${CMAKE_C_FLAGS}")
   set(CMAKE_CXX_FLAGS "-DNDEBUG ${CMAKE_CXX_FLAGS}")