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

CMakePM: Use filePath().deviceEnvironment() to find ninja

Browse Source 
Amends 45ec26783f

Change-Id: I05b52295841d60ff693d6e7b12c9e4ceaf0f09eb
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Cristian Adam
2022-10-17 20:11:08 +02:00
parent ae07c31976
commit 23092b57b8
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -677,7 +677,7 @@ QVariant CMakeGeneratorKitAspect::defaultValue(const Kit *k) const
return g.matches("Ninja"); return g.matches("Ninja");
}); });
if (it != known.constEnd()) { if (it != known.constEnd()) {
const bool hasNinja = [k]() { const bool hasNinja = [k, tool]() {
Internal::CMakeSpecificSettings *settings Internal::CMakeSpecificSettings *settings
= Internal::CMakeProjectPlugin::projectTypeSpecificSettings(); = Internal::CMakeProjectPlugin::projectTypeSpecificSettings();
@@ -685,7 +685,7 @@ QVariant CMakeGeneratorKitAspect::defaultValue(const Kit *k) const
auto findNinja = [](const Environment &env) -> bool { auto findNinja = [](const Environment &env) -> bool {
return !env.searchInPath("ninja").isEmpty(); return !env.searchInPath("ninja").isEmpty();
}; };
if (!findNinja(Environment::systemEnvironment())) if (!findNinja(tool->filePath().deviceEnvironment()))
return findNinja(k->buildEnvironment()); return findNinja(k->buildEnvironment());
} }
return true; return true;