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

Docker/CMake: Use (device-)local paths for build and source directories

Browse Source 
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 <christian.stenger@qt.io>
This commit is contained in:
hjk
2021-06-08 12:25:42 +02:00
parent eba2f2df84
commit 15e4649fe8
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/cmakeprocess.cpp
View File

@@ -89,7 +89,7 @@ void CMakeProcess::run(const BuildDirParameters &parameters, const QStringList &
const Utils::FilePath workDirectory = parameters.workDirectory; const Utils::FilePath workDirectory = parameters.workDirectory;
QTC_ASSERT(workDirectory.exists(), return); QTC_ASSERT(workDirectory.exists(), return);
const QString srcDir = parameters.sourceDirectory.toString(); const QString srcDir = parameters.sourceDirectory.path();
const auto parser = new CMakeParser; const auto parser = new CMakeParser;
parser->setSourceDirectory(srcDir); parser->setSourceDirectory(srcDir);
@@ -113,7 +113,7 @@ void CMakeProcess::run(const BuildDirParameters &parameters, const QStringList &
connect(process.get(), &QtcProcess::finished, connect(process.get(), &QtcProcess::finished,
this, &CMakeProcess::handleProcessFinished); 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); TaskHub::clearTasks(ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM);