From a05414adf665a25b73256c90adc6fd9a72e7146b Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 14 Jul 2021 15:41:06 +0200 Subject: CMake: Fix remote search of non-standard ninja installations Change-Id: I9ec636b126b621bb7a676e55a31845328c9e5ba1 Reviewed-by: Christian Stenger --- src/plugins/cmakeprojectmanager/builddirparameters.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/plugins/cmakeprojectmanager/builddirparameters.cpp') diff --git a/src/plugins/cmakeprojectmanager/builddirparameters.cpp b/src/plugins/cmakeprojectmanager/builddirparameters.cpp index dc71a5eb62..97ab54166c 100644 --- a/src/plugins/cmakeprojectmanager/builddirparameters.cpp +++ b/src/plugins/cmakeprojectmanager/builddirparameters.cpp @@ -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); -- cgit v1.2.1