From a541997abfb3f24a63ad4b24a5fddaf5e6fef127 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Thu, 24 Jan 2013 15:00:27 -0800 Subject: Detect the Intel Compiler version on Unix On Windows, it's completely different and we don't currently support that compiler anyway. Change-Id: Ie3365ea103c93c63e79ebb1d4908c361173ac449 Reviewed-by: Oswald Buddenhagen --- configure | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'configure') diff --git a/configure b/configure index d8cb9be5c1..acd1f9bc14 100755 --- a/configure +++ b/configure @@ -5745,6 +5745,12 @@ case "$QMAKE_CONF_COMPILER" in /^clang version /{s///; s/^\([0-9]*\)\.\([0-9]*\).*$/QT_CLANG_MAJOR_VERSION=\1; QT_CLANG_MINOR_VERSION=\2/;p;q;}'` eval "$COMPILER_VERSION" ;; +*icpc) + # Intel CC + COMPILER_VERSION=`${QMAKE_CONF_COMPILER} -v 2>&1 | sed -n ' +s/icpc version \([0-9]*\)\.\([0-9]*\)\.\([0-9]*\) .*$/QT_ICC_MAJOR_VERSION=\1; QT_ICC_MINOR_VERSION=\2; QT_ICC_PATCH_VERSION=\3/p'` + eval "$COMPILER_VERSION" + ;; *g++*) # GNU C++ COMPILER_VERSION=`${QMAKE_CONF_COMPILER} -dumpversion 2>/dev/null` @@ -6085,6 +6091,11 @@ if [ -n "$QT_GCC_MAJOR_VERSION" ]; then echo "QT_GCC_MINOR_VERSION = $QT_GCC_MINOR_VERSION" >> "$QTCONFIG.tmp" echo "QT_GCC_PATCH_VERSION = $QT_GCC_PATCH_VERSION" >> "$QTCONFIG.tmp" fi +if [ -n "$QT_ICC_MAJOR_VERSION" ]; then + echo "QT_ICC_MAJOR_VERSION = $QT_ICC_MAJOR_VERSION" >> "$QTCONFIG.tmp" + echo "QT_ICC_MINOR_VERSION = $QT_ICC_MINOR_VERSION" >> "$QTCONFIG.tmp" + echo "QT_ICC_PATCH_VERSION = $QT_ICC_PATCH_VERSION" >> "$QTCONFIG.tmp" +fi if [ -n "$QT_CLANG_MAJOR_VERSION" ]; then echo "QT_CLANG_MAJOR_VERSION = $QT_CLANG_MAJOR_VERSION" >> "$QTCONFIG.tmp" echo "QT_CLANG_MINOR_VERSION = $QT_CLANG_MINOR_VERSION" >> "$QTCONFIG.tmp" -- cgit v1.2.3