From 869130ea229c97233ba8b9344538ce1b08bdfdc0 Mon Sep 17 00:00:00 2001 From: bangerth Date: Sat, 5 Nov 2011 17:17:45 +0000 Subject: [PATCH] Do not mistake intel icc 12 for gcc. git-svn-id: https://svn.dealii.org/trunk@24722 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/aclocal.m4 | 10 ++++++++++ deal.II/configure | 7 +++++++ deal.II/doc/news/changes.h | 6 ++++++ 3 files changed, 23 insertions(+) diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4 index f0d766cfcc..26d5548ed0 100644 --- a/deal.II/aclocal.m4 +++ b/deal.II/aclocal.m4 @@ -98,6 +98,16 @@ AC_DEFUN(DEAL_II_DETERMINE_CXX_BRAND, dnl fi fi + dnl Then icc came along and started to identify itself as + dnl icpc version 12.1.0 (gcc version 4.2.1 compatibility) + dnl which also doesn't help... + if test "$GXX" = "yes" ; then + GXX_VERSION_STRING=`($CXX -v 2>&1) | grep "icpc"` + if test "x$GXX_VERSION_STRING" != "x" ; then + GXX=no + fi + fi + if test "$GXX" = yes ; then dnl find out the right version GXX_VERSION_STRING=`($CXX -v 2>&1) | grep "gcc version"` diff --git a/deal.II/configure b/deal.II/configure index 967157dbf8..8594628719 100755 --- a/deal.II/configure +++ b/deal.II/configure @@ -3806,6 +3806,13 @@ fi fi fi + if test "$GXX" = "yes" ; then + GXX_VERSION_STRING=`($CXX -v 2>&1) | grep "icpc"` + if test "x$GXX_VERSION_STRING" != "x" ; then + GXX=no + fi + fi + if test "$GXX" = yes ; then GXX_VERSION_STRING=`($CXX -v 2>&1) | grep "gcc version"` diff --git a/deal.II/doc/news/changes.h b/deal.II/doc/news/changes.h index e27f51dae3..4a9565f70a 100644 --- a/deal.II/doc/news/changes.h +++ b/deal.II/doc/news/changes.h @@ -34,6 +34,12 @@ inconvenience this causes.

General

    +
  1. Fixed: Intel's ICC compiler identifies itself as icpc version +12.1.0 (gcc version 4.2.1 compatibility) which we mistook as being +GCC version 4.2. This is now fixed. +
    +(Wolfgang Bangerth, 2011/11/05) +
  2. Fixed: deal.II could not be compiled with gcc 4.6.1 when MPI is enabled due to a missing include file in file source/base/utilities.cc. This is now fixed. -- 2.39.5