From 33275ab92d55ef9ebea5cace125974a56f881a19 Mon Sep 17 00:00:00 2001 From: bangerth Date: Sat, 30 Jun 2007 05:11:16 +0000 Subject: [PATCH] Use the right flag for icc10 git-svn-id: https://svn.dealii.org/trunk@14834 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/aclocal.m4 | 16 ++++++++++++---- deal.II/configure | 13 ++++++++++--- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4 index 8739cb90e5..37ad5c9d44 100644 --- a/deal.II/aclocal.m4 +++ b/deal.II/aclocal.m4 @@ -634,10 +634,18 @@ AC_DEFUN(DEAL_II_SET_CXX_FLAGS, dnl CXXFLAGSO="$CXXFLAGSO -w0 -wd424 -wd11" dnl To reduce output, use -opt_report_levelmin where possible, - dnl i.e. post icc5 - if test "x$GXX_VERSION" != "xintel_icc5" ; then - CXXFLAGSO="$CXXFLAGSO -opt_report_levelmin" - fi + dnl i.e. post icc5. from icc10 onwards, this flag is called + dnl -opt-report + case "$GXX_VERSION" in + intel_icc5) + ;; + intel_icc[6789]) + CXXFLAGSO="$CXXFLAGSO -opt_report_levelmin" + ;; + *) + CXXFLAGSO="$CXXFLAGSO -opt-report 0" + ;; + esac dnl Some versions of icc on some platforms issue a lot of warnings dnl about the unreliability of floating point comparisons. Check diff --git a/deal.II/configure b/deal.II/configure index 8cef10269d..f933bad88b 100755 --- a/deal.II/configure +++ b/deal.II/configure @@ -4206,9 +4206,16 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CXXFLAGSG="$CXXFLAGSG -w1 -wd175 -wd525 -wd327 -wd424 -wd11 -wd734 -wd858" CXXFLAGSO="$CXXFLAGSO -w0 -wd424 -wd11" - if test "x$GXX_VERSION" != "xintel_icc5" ; then - CXXFLAGSO="$CXXFLAGSO -opt_report_levelmin" - fi + case "$GXX_VERSION" in + intel_icc5) + ;; + intel_icc6789) + CXXFLAGSO="$CXXFLAGSO -opt_report_levelmin" + ;; + *) + CXXFLAGSO="$CXXFLAGSO -opt-report 0" + ;; + esac { echo "$as_me:$LINENO: checking whether -wd1572 is allowed" >&5 -- 2.39.5