From 6ea926f6e03395b047abe5cd26c91cec9ee575b9 Mon Sep 17 00:00:00 2001 From: Ivan Komissarov Date: Sat, 15 Feb 2020 00:11:13 +0100 Subject: Add clang-cl to the list of known toolchains Change-Id: I4521ac3de8822a9b7fecb33f6aa27cb380f01ed9 Reviewed-by: Christian Kandeler --- src/lib/corelib/tools/toolchains.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/lib') diff --git a/src/lib/corelib/tools/toolchains.cpp b/src/lib/corelib/tools/toolchains.cpp index 0d793f8aa..6263fb199 100644 --- a/src/lib/corelib/tools/toolchains.cpp +++ b/src/lib/corelib/tools/toolchains.cpp @@ -49,9 +49,11 @@ namespace qbs { namespace Internal { static const QString clangToolchain() { return QStringLiteral("clang"); } +static const QString clangClToolchain() { return QStringLiteral("clang-cl"); } static const QString gccToolchain() { return QStringLiteral("gcc"); } static const QString llvmToolchain() { return QStringLiteral("llvm"); } static const QString mingwToolchain() { return QStringLiteral("mingw"); } +static const QString msvcToolchain() { return QStringLiteral("msvc"); } } using namespace Internal; @@ -64,7 +66,8 @@ QStringList canonicalToolchain(const QStringList &toolchain) llvmToolchain(), mingwToolchain(), gccToolchain(), - QStringLiteral("msvc") + clangClToolchain(), + msvcToolchain() }; // Canonicalize each toolchain in the toolchain list, @@ -110,6 +113,8 @@ QStringList canonicalToolchain(const QString &name) else if (toolchainName == llvmToolchain() || toolchainName == mingwToolchain()) { toolchains << canonicalToolchain(QStringLiteral("gcc")); + } else if (toolchainName == clangClToolchain()) { + toolchains << canonicalToolchain(msvcToolchain()); } return toolchains; } -- cgit v1.2.3