Reactivate -O2 for icc-14*

git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@31193 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/cmake/setup_compiler_flags_intel.cmake b/deal.II/cmake/setup_compiler_flags_intel.cmake
index c10cb5e91e74b1bf3631dd601e2001d0b3f95d81..3955028811ab36709765671d397f2a4a4be5dd90 100644 (file)
--- a/deal.II/cmake/setup_compiler_flags_intel.cmake
+++ b/deal.II/cmake/setup_compiler_flags_intel.cmake
@@ -118,9 +118,7 @@ IF (CMAKE_BUILD_TYPE MATCHES "Release")
   # General optimization flags:
   #
 
-  IF(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "13.0" )
-    ADD_FLAGS(DEAL_II_CXX_FLAGS_RELEASE "-O2")
-  ELSE()
+  IF(CMAKE_CXX_COMPILER_VERSION MATCHES "^13\\.")
     #
     # Disable aggressive optimization for intel-13* compilers, until we
     # resolve a lot of funny miscompilations...
@@ -128,13 +126,16 @@ IF (CMAKE_BUILD_TYPE MATCHES "Release")
     # - Maier, 2013
     #
     ADD_FLAGS(DEAL_II_CXX_FLAGS_RELEASE "-O1")
+  ELSE()
+    ADD_FLAGS(DEAL_II_CXX_FLAGS_RELEASE "-O2")
   ENDIF()
 
+  # equivalent to -fno-strict-aliasing:
+  ENABLE_IF_SUPPORTED(DEAL_II_CXX_FLAGS_RELEASE "-no-ansi-alias")
+
   ENABLE_IF_SUPPORTED(DEAL_II_CXX_FLAGS_RELEASE "-ip")
 
   ENABLE_IF_SUPPORTED(DEAL_II_CXX_FLAGS_RELEASE "-funroll-loops")
-  # equivalent to -fno-strict-aliasing:
-  ENABLE_IF_SUPPORTED(DEAL_II_CXX_FLAGS_RELEASE "-no-ansi-alias")
 ENDIF()