Put the -no-vec declaration into the right file :->

git-svn-id: https://svn.dealii.org/trunk@31765 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/cmake/checks/check_03_compiler_bugs.cmake b/deal.II/cmake/checks/check_03_compiler_bugs.cmake
index a31f9f48241bc02f20ecbf20555e11ceef4a3390..f278a9435d92b8d912e20a154e2be0002659fd84 100644 (file)
--- a/deal.II/cmake/checks/check_03_compiler_bugs.cmake
+++ b/deal.II/cmake/checks/check_03_compiler_bugs.cmake
@@ -350,6 +350,19 @@ IF( DEAL_II_ICC_NUMERICLIMITS_BUG OR
 ENDIF()
 
 
+#
+# in intel (at least 13.1 and 14), vectorization causes
+# wrong code. See https://code.google.com/p/dealii/issues/detail?id=156
+# or tests/hp/solution_transfer.cc
+# A work-around is to disable all vectorization.
+#
+# - Timo Heister, 2013
+#
+IF(CMAKE_CXX_COMPILER_ID MATCHES "Intel")
+  ENABLE_IF_SUPPORTED(DEAL_II_CXX_FLAGS_RELEASE "-no-vec")
+ENDIF()
+
+
 #
 # gcc-4.8.1 has some problems with the constexpr "vertices_per_cell" in the
 # definition of alternating_form_at_vertices.

diff --git a/deal.II/cmake/setup_compiler_flags_intel.cmake b/deal.II/cmake/setup_compiler_flags_intel.cmake
index aabd08e7ffbdba4c008e6eef2b375c6a3b47698f..d29abc6537e85819ca06a15691bf9b1a5c705c28 100644 (file)
--- a/deal.II/cmake/setup_compiler_flags_intel.cmake
+++ b/deal.II/cmake/setup_compiler_flags_intel.cmake
@@ -128,12 +128,6 @@ IF (CMAKE_BUILD_TYPE MATCHES "Release")
   #
 
   ADD_FLAGS(DEAL_II_CXX_FLAGS_RELEASE "-O2")
-  # in intel (at least 13.1 and 14), vectorization causes
-  # wrong code. See https://code.google.com/p/dealii/issues/detail?id=156
-  # or tests/hp/solution_transfer.cc
-  # A work-around is to disable all vectorization.
-  ADD_FLAGS(DEAL_II_CXX_FLAGS_RELEASE "-no-vec")
-
 
   # equivalent to -fno-strict-aliasing:
   ENABLE_IF_SUPPORTED(DEAL_II_CXX_FLAGS_RELEASE "-no-ansi-alias")