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

CMake: Pick Ninja generator when installer added ninja

Browse Source 
Pick the Ninja CMake generator when the installer has installed
the ninja binary.

Task-number: QTCREATORBUG-23650
Change-Id: I966b369513e7d489161b210819832f1bbbb5a0fc
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Tobias Hunger
2020-03-03 12:23:04 +01:00
parent 4165d16053
commit 8e47fc18a6
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/cmakeprojectmanager/cmakekitinformation.cpp
View File

@@ -25,8 +25,10 @@
#include "cmakekitinformation.h" #include "cmakekitinformation.h"
#include "cmakeprojectconstants.h" #include "cmakeprojectconstants.h"
#include "cmaketoolmanager.h" #include "cmakeprojectplugin.h"
#include "cmakespecificsettings.h"
#include "cmaketool.h" #include "cmaketool.h"
#include "cmaketoolmanager.h"
#include <app/app_version.h> #include <app/app_version.h>
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
@@ -613,10 +615,19 @@ QVariant CMakeGeneratorKitAspect::defaultValue(const Kit *k) const
return g.matches("Ninja", extraGenerator); return g.matches("Ninja", extraGenerator);
}); });
if (it != known.constEnd()) { if (it != known.constEnd()) {
const bool hasNinja = [k]() {
Internal::CMakeSpecificSettings *settings
= Internal::CMakeProjectPlugin::projectTypeSpecificSettings();
if (settings->ninjaPath().isEmpty()) {
Utils::Environment env = Utils::Environment::systemEnvironment(); Utils::Environment env = Utils::Environment::systemEnvironment();
k->addToEnvironment(env); k->addToEnvironment(env);
const Utils::FilePath ninjaExec = env.searchInPath(QLatin1String("ninja")); return !env.searchInPath("ninja").isEmpty();
if (!ninjaExec.isEmpty()) }
return true;
}();
if (hasNinja)
return GeneratorInfo({QString("Ninja"), extraGenerator, QString(), QString()}).toVariant(); return GeneratorInfo({QString("Ninja"), extraGenerator, QString(), QString()}).toVariant();
} }