feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Experimental clang-cl based toolchain: Support MSVC 2013 as well.

Browse Source 
Search for MSVC 2013 if MSVC 2015 cannot be found since clang-cl
supports both. Amends change eb4d1584b6.

Task-number: QTBUG-50804
Task-number: QTCREATORBUG-15641
Change-Id: I0e57dfb080292020924cbcb69b87b47743775ec3
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
Friedemann Kleint
2016-02-15 14:47:09 +01:00
parent fd085ed268
commit ca27222d0f
1 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/plugins/projectexplorer/msvctoolchain.cpp
View File

@@ -696,7 +696,16 @@ static void detectCppBuildTools(QList<ToolChain *> *list)
}
}
// Detect Clang-cl on top of MSVC2015.
static ToolChain *findMsvcToolChain(const QList<ToolChain *> &list,
unsigned char wordWidth, Abi::OSFlavor flavor)
{
return Utils::findOrDefault(list, [wordWidth, flavor] (const ToolChain *tc)
{ const Abi abi = tc->targetAbi();
return abi.osFlavor() == flavor
&& wordWidth == abi.wordWidth();} );
}
// Detect Clang-cl on top of MSVC2015 or MSVC2013.
static void detectClangClToolChain(QList<ToolChain *> *list)
{
#ifdef Q_OS_WIN64
@@ -713,17 +722,19 @@ static void detectClangClToolChain(QList<ToolChain *> *list)
return;
const unsigned char wordWidth = Utils::is64BitWindowsBinary(path + QStringLiteral("/bin/") + QLatin1String(clangClBinary))
? 64 : 32;
const auto it = std::find_if(list->cbegin(), list->cend(),
[wordWidth] (ToolChain *tc) { const Abi abi = tc->targetAbi();
return abi.osFlavor() == Abi::WindowsMsvc2015Flavor
&& wordWidth == abi.wordWidth();} );
if (it == list->cend())
const ToolChain *toolChain = findMsvcToolChain(*list, wordWidth, Abi::WindowsMsvc2015Flavor);
if (!toolChain)
toolChain = findMsvcToolChain(*list, wordWidth, Abi::WindowsMsvc2013Flavor);
if (!toolChain) {
qWarning("Unable to find a suitable MSVC version for \"%s\".", qPrintable(QDir::toNativeSeparators(path)));
const MsvcToolChain *msvcToolChain = static_cast<MsvcToolChain *>(*it);
return;
}
const MsvcToolChain *msvcToolChain = static_cast<const MsvcToolChain *>(toolChain);
const Abi targetAbi = msvcToolChain->targetAbi();
const QString name = QStringLiteral("LLVM ") + QString::number(wordWidth)
+ QStringLiteral("bit based on MSVC2015");
list->append(new ClangClToolChain(name, path, msvcToolChain->targetAbi(),
+ QStringLiteral("bit based on ")
+ Abi::toString(targetAbi.osFlavor()).toUpper();
list->append(new ClangClToolChain(name, path, targetAbi,
msvcToolChain->varsBat(), msvcToolChain->varsBatArg(),
ToolChain::AutoDetection));
}