From 15e4649fe8826c7405bddaf844169f072b2758ec Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 8 Jun 2021 12:25:42 +0200 Subject: [PATCH] Docker/CMake: Use (device-)local paths for build and source directories These are used as parameters to the cmake process that is run on the build device, i.e. they are local relative to that. Change-Id: I07fdd04c91def8d8d6e3a65fbbb17914abecd585 Reviewed-by: Christian Stenger --- src/plugins/cmakeprojectmanager/cmakeprocess.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/cmakeprojectmanager/cmakeprocess.cpp b/src/plugins/cmakeprojectmanager/cmakeprocess.cpp index 4bf87c3a8fc..3e7585f56d7 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprocess.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeprocess.cpp @@ -89,7 +89,7 @@ void CMakeProcess::run(const BuildDirParameters ¶meters, const QStringList & const Utils::FilePath workDirectory = parameters.workDirectory; QTC_ASSERT(workDirectory.exists(), return); - const QString srcDir = parameters.sourceDirectory.toString(); + const QString srcDir = parameters.sourceDirectory.path(); const auto parser = new CMakeParser; parser->setSourceDirectory(srcDir); @@ -113,7 +113,7 @@ void CMakeProcess::run(const BuildDirParameters ¶meters, const QStringList & connect(process.get(), &QtcProcess::finished, this, &CMakeProcess::handleProcessFinished); - Utils::CommandLine commandLine(cmake->cmakeExecutable(), QStringList({"-S", srcDir, QString("-B"), workDirectory.toString()}) + arguments); + CommandLine commandLine(cmake->cmakeExecutable(), QStringList({"-S", srcDir, "-B", workDirectory.path()}) + arguments); TaskHub::clearTasks(ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM);