diff options
| author | Denis Shienkov <denis.shienkov@gmail.com> | 2019-07-02 21:35:43 +0300 |
|---|---|---|
| committer | Denis Shienkov <denis.shienkov@gmail.com> | 2019-07-03 14:03:06 +0000 |
| commit | cfcae6d5927e1ffda42a7b367c89e201d61fc872 (patch) | |
| tree | 3219f6ef16d11a93d8c090c3dfda5a78dc98d1ba /src/app/qbs-setup-toolchains/probe.h | |
| parent | b445b86dd30bc2a3e12525cdbafc60e24aeb200f (diff) | |
baremetal: Detect IAREW compiler version if it is found in a path
Previously we have only the IAR toolchain version detection from
the Windows registry.
This patch adds a compiler version detection in case the compiler
path specified in a PATH environment variable.
Change-Id: I61578723e15f109542aba1e231753aec611439eb
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Reviewed-by: Qbs CI Bot <travis-bot@weickelt.de>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/app/qbs-setup-toolchains/probe.h')
| -rw-r--r-- | src/app/qbs-setup-toolchains/probe.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/app/qbs-setup-toolchains/probe.h b/src/app/qbs-setup-toolchains/probe.h index dab48a340..5e0ccc33c 100644 --- a/src/app/qbs-setup-toolchains/probe.h +++ b/src/app/qbs-setup-toolchains/probe.h @@ -63,4 +63,10 @@ struct ToolchainInstallInfo qbs::Version compilerVersion; }; +inline bool operator<(const ToolchainInstallInfo &lhs, const ToolchainInstallInfo &rhs) +{ return lhs.compilerPath.absoluteFilePath() < rhs.compilerPath.absoluteFilePath() + || lhs.compilerVersion < rhs.compilerVersion; } + +int extractVersion(const QByteArray ¯oDump, const QByteArray &keyToken); + #endif // Header guard |