From: bangerth Date: Wed, 15 Apr 2009 13:58:10 +0000 (+0000) Subject: Detect icc11. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=94f088f4a0db947db13da4980cadc3ca8b53c52e;p=dealii-svn.git Detect icc11. git-svn-id: https://svn.dealii.org/trunk@18615 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4 index ee17ade4cc..fe88c50986 100644 --- a/deal.II/aclocal.m4 +++ b/deal.II/aclocal.m4 @@ -321,6 +321,7 @@ AC_DEFUN(DEAL_II_DETERMINE_CXX_BRAND, dnl version8="`echo $version_string | grep 'Version 8'`" version9="`echo $version_string | grep 'Version 9'`" version10="`echo $version_string | grep 'Version 10'`" + version11="`echo $version_string | grep 'Version 11'`" if test "x$version5" != "x" ; then AC_MSG_RESULT(C++ compiler is icc-5) GXX_VERSION=intel_icc5 @@ -339,10 +340,13 @@ AC_DEFUN(DEAL_II_DETERMINE_CXX_BRAND, dnl else if test "x$version10" != "x" ; then AC_MSG_RESULT(C++ compiler is icc-10) GXX_VERSION=intel_icc10 + else if test "x$version11" != "x" ; then + AC_MSG_RESULT(C++ compiler is icc-11) + GXX_VERSION=intel_icc11 else AC_MSG_RESULT(C++ compiler is icc) GXX_VERSION=intel_icc - fi fi fi fi fi fi + fi fi fi fi fi fi fi GXX_VERSION_DETAILED="$GXX_VERSION" else diff --git a/deal.II/configure b/deal.II/configure index 6ef607dc0c..8410f3c5b1 100755 --- a/deal.II/configure +++ b/deal.II/configure @@ -3741,6 +3741,7 @@ echo "${ECHO_T}C++ compiler is unknown version but accepted MIPSpro compiler ver version8="`echo $version_string | grep 'Version 8'`" version9="`echo $version_string | grep 'Version 9'`" version10="`echo $version_string | grep 'Version 10'`" + version11="`echo $version_string | grep 'Version 11'`" if test "x$version5" != "x" ; then { echo "$as_me:$LINENO: result: C++ compiler is icc-5" >&5 echo "${ECHO_T}C++ compiler is icc-5" >&6; } @@ -3765,11 +3766,15 @@ echo "${ECHO_T}C++ compiler is icc-9" >&6; } { echo "$as_me:$LINENO: result: C++ compiler is icc-10" >&5 echo "${ECHO_T}C++ compiler is icc-10" >&6; } GXX_VERSION=intel_icc10 + else if test "x$version11" != "x" ; then + { echo "$as_me:$LINENO: result: C++ compiler is icc-11" >&5 +echo "${ECHO_T}C++ compiler is icc-11" >&6; } + GXX_VERSION=intel_icc11 else { echo "$as_me:$LINENO: result: C++ compiler is icc" >&5 echo "${ECHO_T}C++ compiler is icc" >&6; } GXX_VERSION=intel_icc - fi fi fi fi fi fi + fi fi fi fi fi fi fi GXX_VERSION_DETAILED="$GXX_VERSION" else