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

CMake: Fix remote search of non-standard ninja installations

Browse Source 
Change-Id: I9ec636b126b621bb7a676e55a31845328c9e5ba1
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2021-07-14 15:41:06 +02:00
parent a7756a72fd
commit a05414adf6
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/cmakeprojectmanager/builddirparameters.cpp
View File

@@ -86,9 +86,9 @@ BuildDirParameters::BuildDirParameters(CMakeBuildConfiguration *bc)
CMakeSpecificSettings *settings = CMakeProjectPlugin::projectTypeSpecificSettings();
if (!settings->ninjaPath.filePath().isEmpty()) {
const Utils::FilePath setting = settings->ninjaPath.filePath();
const Utils::FilePath path = setting.toFileInfo().isFile() ? setting.parentDir() : setting;
environment.appendOrSetPath(path.toString());
const Utils::FilePath ninja = settings->ninjaPath.filePath();
const Utils::FilePath ninjaDir = ninja.isFile() ? ninja.parentDir() : ninja;
environment.appendOrSetPath(ninjaDir.path());
}
cmakeToolId = CMakeKitAspect::cmakeToolId(k);