From 56abb9aade2fb5e663a5ce636df8d138c21d8692 Mon Sep 17 00:00:00 2001 From: bangerth Date: Sun, 17 Jun 2012 13:20:30 +0000 Subject: [PATCH] Detect Cray C++. git-svn-id: https://svn.dealii.org/trunk@25630 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/aclocal.m4 | 25 ++++++++++++++++++++----- deal.II/configure | 26 ++++++++++++++++++++------ 2 files changed, 40 insertions(+), 11 deletions(-) diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4 index c3a5571bd9..ecb001446e 100644 --- a/deal.II/aclocal.m4 +++ b/deal.II/aclocal.m4 @@ -311,6 +311,7 @@ AC_DEFUN(DEAL_II_DETERMINE_CXX_BRAND, dnl GXX_VERSION_DETAILED="$GXX_VERSION" else + dnl Maybe CLang? is_clang="`($CXX --version 2>&1) | grep clang`" if test "x$is_clang" != x ; then AC_MSG_RESULT(C++ compiler is clang) @@ -319,11 +320,21 @@ AC_DEFUN(DEAL_II_DETERMINE_CXX_BRAND, dnl GXX_VERSION_DETAILED="$GXX_VERSION" else - dnl Aw, nothing suitable found... - AC_MSG_RESULT(Unrecognized C++ compiler -- Try to go ahead and get help from dealii@dealii.org) - GXX_BRAND=Unknown - GXX_VERSION=unknown_cc - GXX_VERSION_DETAILED="$GXX_VERSION" + dnl Maybe Cray C++? + is_cray="`($CXX -V 2>&1) | grep Cray`" + if test "x$is_cray" != x ; then + AC_MSG_RESULT(C++ compiler is Cray C++) + GXX_BRAND=cray + GXX_VERSION=cray + GXX_VERSION_DETAILED="$GXX_VERSION" + else + + dnl Aw, nothing suitable found... + AC_MSG_RESULT(Unrecognized C++ compiler -- Try to go ahead and get help from dealii@dealii.org) + GXX_BRAND=Unknown + GXX_VERSION=unknown_cc + GXX_VERSION_DETAILED="$GXX_VERSION" + fi fi fi fi @@ -2362,6 +2373,10 @@ AC_DEFUN(DEAL_II_CHECK_MULTITHREADING, dnl LDFLAGS="$LDFLAGS -lpthread" ;; + cray*) + LDFLAGS="$LDFLAGS -lpthread" + ;; + pgCC*) LDFLAGS="$LDFLAGS -lpthread" ;; diff --git a/deal.II/configure b/deal.II/configure index 995c3826f5..c917411264 100755 --- a/deal.II/configure +++ b/deal.II/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 25492 . +# From configure.in Revision: 25614 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.68 for deal.II 7.2.pre. # @@ -4044,7 +4044,7 @@ $as_echo "C++ compiler is PathScale C++" >&6; } GXX_VERSION_DETAILED="$GXX_VERSION" else - is_clang="`($CXX --version 2>&1) | grep clang`" + is_clang="`($CXX --version 2>&1) | grep clang`" if test "x$is_clang" != x ; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: C++ compiler is clang" >&5 $as_echo "C++ compiler is clang" >&6; } @@ -4053,11 +4053,21 @@ $as_echo "C++ compiler is clang" >&6; } GXX_VERSION_DETAILED="$GXX_VERSION" else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Unrecognized C++ compiler -- Try to go ahead and get help from dealii@dealii.org" >&5 + is_cray="`($CXX -V 2>&1) | grep Cray`" + if test "x$is_cray" != x ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: C++ compiler is Cray C++" >&5 +$as_echo "C++ compiler is Cray C++" >&6; } + GXX_BRAND=cray + GXX_VERSION=cray + GXX_VERSION_DETAILED="$GXX_VERSION" + else + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Unrecognized C++ compiler -- Try to go ahead and get help from dealii@dealii.org" >&5 $as_echo "Unrecognized C++ compiler -- Try to go ahead and get help from dealii@dealii.org" >&6; } - GXX_BRAND=Unknown - GXX_VERSION=unknown_cc - GXX_VERSION_DETAILED="$GXX_VERSION" + GXX_BRAND=Unknown + GXX_VERSION=unknown_cc + GXX_VERSION_DETAILED="$GXX_VERSION" + fi fi fi fi @@ -5965,6 +5975,10 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext LDFLAGS="$LDFLAGS -lpthread" ;; + cray*) + LDFLAGS="$LDFLAGS -lpthread" + ;; + pgCC*) LDFLAGS="$LDFLAGS -lpthread" ;; -- 2.39.5