From 5e8d6aca2746b601402d32c73b5b577b203a32cd Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Sat, 25 Jul 2015 15:23:44 +0200 Subject: [PATCH 1/1] remove some more cruft related to gcc v4.6 (we request v4.7) --- buildtools/Cmake/Flags.cmake | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/buildtools/Cmake/Flags.cmake b/buildtools/Cmake/Flags.cmake index f42cc80752..8072d1db3d 100644 --- 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_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() @@ -85,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}") -- 2.20.1