summaryrefslogtreecommitdiffstats
path: root/tools/configure/environment.h
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2011-12-29 22:44:16 -0200
committerQt by Nokia <qt-info@nokia.com>2012-06-12 17:34:52 +0200
commitb4525b34074665ed472cd421077a1633110f16a7 (patch)
treec8b9aa1d8e3991c02400b3b93593812a61346222 /tools/configure/environment.h
parentf9c9d8aaa6684f596cf5675592782d5397e52093 (diff)
Add configure-time checking for the SSE and AVX features on Windows
Modify configure.exe to run some configure-time tests and check if the SSE and AVX compiler features are supported. The tests themselves required a bit of changes to compile with MSVC. The include in sse4_2.cpp was wrong. And for whatever reason, it didn't like the volatile variables, which GCC, Clang and ICC have been happy with. This should produce no effect in compilation, though: even dead code must be syntactically correct. We're not running the output. Change-Id: Ibe5d0904a378a7efed853c7215f88a2ddcefb1b3 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'tools/configure/environment.h')
-rw-r--r--tools/configure/environment.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/configure/environment.h b/tools/configure/environment.h
index 5075e9ae5b..979d538e8a 100644
--- a/tools/configure/environment.h
+++ b/tools/configure/environment.h
@@ -66,7 +66,7 @@ public:
static bool detectExecutable(const QString &executable);
static int execute(QStringList arguments, const QStringList &additionalEnv, const QStringList &removeEnv);
- static QString execute(const QString &command);
+ static QString execute(const QString &command, int *returnCode = 0);
static bool cpdir(const QString &srcDir,
const QString &destDir,
const QString &includeSrcDir = QString());