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

CMake: Use Utils::CommandLine in CMakeProcess

Browse Source 
Change-Id: If8dc221232869012d38ca7c02012cb7db5482d3a
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Tobias Hunger
2019-06-07 15:26:00 +02:00
parent ca4ba34229
commit 169ced3e08
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/cmakeprojectmanager/cmakeprocess.cpp
View File

@@ -126,16 +126,15 @@ void CMakeProcess::run(const BuildDirParameters &parameters, const QStringList &
connect(process.get(), QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished), connect(process.get(), QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished),
this, &CMakeProcess::handleProcessFinished); this, &CMakeProcess::handleProcessFinished);
QString args; QStringList args(srcDir);
Utils::QtcProcess::addArg(&args, srcDir); args += parameters.generatorArguments;
Utils::QtcProcess::addArgs(&args, parameters.generatorArguments); args += arguments;
Utils::QtcProcess::addArgs(&args, arguments); Utils::CommandLine commandLine(cmake->cmakeExecutable(), args);
TaskHub::clearTasks(ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM); TaskHub::clearTasks(ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM);
Core::MessageManager::write(tr("Running \"%1 %2\" in %3.") Core::MessageManager::write(tr("Running %1 in %2.")
.arg(cmake->cmakeExecutable().toUserOutput()) .arg(commandLine.toUserOutput())
.arg(args)
.arg(workDirectory.toUserOutput())); .arg(workDirectory.toUserOutput()));
auto future = std::make_unique<QFutureInterface<void>>(); auto future = std::make_unique<QFutureInterface<void>>();
@@ -144,7 +143,7 @@ void CMakeProcess::run(const BuildDirParameters &parameters, const QStringList &
tr("Configuring \"%1\"").arg(parameters.projectName), tr("Configuring \"%1\"").arg(parameters.projectName),
"CMake.Configure"); "CMake.Configure");
process->setCommand(Utils::CommandLine(cmake->cmakeExecutable(), args, Utils::CommandLine::Raw)); process->setCommand(commandLine);
emit started(); emit started();
process->start(); process->start();