diff options
| author | Denis Shienkov <denis.shienkov@gmail.com> | 2019-08-14 11:55:35 +0300 |
|---|---|---|
| committer | Denis Shienkov <denis.shienkov@gmail.com> | 2019-08-15 14:03:47 +0000 |
| commit | adf6c77084edf9e181ea7f093a2da3d9ada2db81 (patch) | |
| tree | a4a2a0f35140f3280e8c8c6eed3922e54c82f7c8 | |
| parent | 2ae6989a8605f9be15defd294f2726b01bd5f093 (diff) | |
baremetal: Auto-detect IAR toolchain for MSP430 architecture on Windows
Change-Id: Ifc15d008ffd64e160d40a0a3e0f1b868dde4e8a4
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| -rw-r--r-- | src/app/qbs-setup-toolchains/iarewprobe.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/app/qbs-setup-toolchains/iarewprobe.cpp b/src/app/qbs-setup-toolchains/iarewprobe.cpp index 4a8ed499b..47592b9c0 100644 --- a/src/app/qbs-setup-toolchains/iarewprobe.cpp +++ b/src/app/qbs-setup-toolchains/iarewprobe.cpp @@ -58,7 +58,8 @@ using Internal::HostOsInfo; static QStringList knownIarCompilerNames() { return {QStringLiteral("icc8051"), QStringLiteral("iccarm"), - QStringLiteral("iccavr"), QStringLiteral("iccstm8")}; + QStringLiteral("iccavr"), QStringLiteral("iccstm8"), + QStringLiteral("icc430")}; } static QString guessIarArchitecture(const QFileInfo &compiler) @@ -72,6 +73,8 @@ static QString guessIarArchitecture(const QFileInfo &compiler) return QStringLiteral("avr"); if (baseName == QLatin1String("iccstm8")) return QStringLiteral("stm8"); + if (baseName == QLatin1String("icc430")) + return QStringLiteral("msp430"); return {}; } @@ -141,7 +144,8 @@ static Version dumpIarCompilerVersion(const QFileInfo &compiler) return Version{verCode / 1000000, (verCode / 1000) % 1000, verCode % 1000}; } else if (arch == QLatin1String("avr") || arch == QLatin1String("mcs51") - || arch == QLatin1String("stm8")) { + || arch == QLatin1String("stm8") + || arch == QLatin1String("msp430")) { return Version{verCode / 100, verCode % 100}; } @@ -186,6 +190,7 @@ static std::vector<ToolchainInstallInfo> installedIarsFromRegistry() {QStringLiteral("EWAVR"), QStringLiteral("\\avr\\bin\\iccavr.exe")}, {QStringLiteral("EW8051"), QStringLiteral("\\8051\\bin\\icc8051.exe")}, {QStringLiteral("EWSTM8"), QStringLiteral("\\stm8\\bin\\iccstm8.exe")}, + {QStringLiteral("EW430"), QStringLiteral("\\430\\bin\\icc430.exe")}, }; QSettings registry(QLatin1String(kRegistryNode), QSettings::NativeFormat); |