From 3e4a136b92530b651c14fc6f04b9d07b523d7700 Mon Sep 17 00:00:00 2001 From: kanschat Date: Wed, 6 Oct 2010 15:50:32 +0000 Subject: [PATCH] test for portland group compiler version... no autoconf here, so apologies in advance if things break git-svn-id: https://svn.dealii.org/trunk@22271 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/aclocal.m4 | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4 index 3acbd2ee35..38b8fd74c0 100644 --- a/deal.II/aclocal.m4 +++ b/deal.II/aclocal.m4 @@ -238,9 +238,11 @@ AC_DEFUN(DEAL_II_DETERMINE_CXX_BRAND, dnl dnl Portland Group C++? is_pgcc="`($CXX -V 2>&1) | grep 'Portland Group'`" if test "x$is_pgcc" != "x" ; then - AC_MSG_RESULT(C++ compiler is Portland Group C++) - GXX_VERSION=portland_group - GXX_VERSION_DETAILED="$GXX_VERSION" + GXX_VERSION_STRING=`($CXX -V 2>&1) | grep "^pgCC"` + full_version=`echo "$GXX_VERSION_STRING" | perl -pi -e 's/.*pgCC\s+(\S+).*/\1/g;'` + GXX_VERSION=pgCC`echo $full_version | perl -pi -e 's/(\d\.\d).*/\1/g;'` + GXX_VERSION_DETAILED="$GXX_VERSION" + AC_MSG_RESULT(C++ compiler is Portland Group C++ $full_version) else dnl HP aCC? @@ -1211,8 +1213,10 @@ AC_DEFUN(DEAL_II_DETERMINE_CC_BRAND, dnl dnl Portland Group C? is_pgcc="`($CC -V 2>&1) | grep 'Portland Group'`" if test "x$is_pgcc" != "x" ; then - AC_MSG_RESULT(C compiler is Portland Group C) - CC_VERSION=portland_group + CC_VERSION_STRING=`($CC -V 2>&1) | grep "^pgcc"` + full_version=`echo "$CC_VERSION_STRING" | perl -pi -e 's/.*pgcc\s+(\S+).*/\1/g;'` + CC_VERSION=pgcc`echo $full_version | perl -pi -e 's/(\d\.\d).*/\1/g;'` + AC_MSG_RESULT(C compiler is Portland Group C $full_version) else dnl HP aCC? -- 2.39.5