diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-11-02 13:24:43 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-11-07 13:01:55 +0000 |
| commit | eda3184a67c35d9250bad54c36c6d55f8772e43f (patch) | |
| tree | 5b48b78dce99a0f5916797cf9931a784f1c0bfcc /configure.pri | |
| parent | 6172ebaf301c42b0c87396a9c6f0816081dddef9 (diff) | |
| download | qtbase-eda3184a67c35d9250bad54c36c6d55f8772e43f.tar.gz | |
fix icpc version detection
the regex didn't match the actual output ("icpc (ICC) 17.0.0 20160721"),
and the code failed to concatenate the lines (broken in 492d7d14fc, as
for clang).
but using -dumpversion (as we do for g++) is more elegant anyway, so do
it instead.
Change-Id: I328bbfab9c08d6e660c3f1ec51554d9f877b8f66
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'configure.pri')
| -rw-r--r-- | configure.pri | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/configure.pri b/configure.pri index 6d318f63cb..b78d075b61 100644 --- a/configure.pri +++ b/configure.pri @@ -242,11 +242,11 @@ defineTest(qtConfTest_checkCompiler) { $${1}.compilerDescription = "GCC" $${1}.compilerId = "gcc" $${1}.compilerVersion = $$version - } else: contains(QMAKE_CXX, ".*icpc" ) { - qtRunLoggedCommand("$$QMAKE_CXX -v", version)|return(false) + } else: contains(QMAKE_CXX, ".*icpc") { + qtRunLoggedCommand("$$QMAKE_CXX -dumpversion", version)|return(false) $${1}.compilerDescription = "ICC" $${1}.compilerId = "icc" - $${1}.compilerVersion = $$replace(version, "icpc version ([0-9.]+).*", "\\1") + $${1}.compilerVersion = $$version } else: msvc { command = $$QMAKE_CXX /EP /nologo $$source $$system_quote($$QMAKE_CONFIG_TESTS_DIR/win/msvc_version.cpp) qtRunLoggedCommand("$$command", version)|return(false) |