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

CMakePM: print newline before the message

Browse Source 
This way we'll get:
  [cmake]
  [cmake] Elapsed time: 00:05.

And not the other way around.

Change-Id: Ica7352cd112b9017c8a39b98618be69494527be9
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Cristian Adam
2023-10-05 18:44:00 +02:00
parent d6f2a73c81
commit 162f9f59d7
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -61,7 +61,7 @@ void CMakeProcess::run(const BuildDirParameters &parameters, const QStringList &
const QString msg = ::CMakeProjectManager::Tr::tr( const QString msg = ::CMakeProjectManager::Tr::tr(
"The source directory %1 is not reachable by the CMake executable %2.") "The source directory %1 is not reachable by the CMake executable %2.")
.arg(parameters.sourceDirectory.displayName()).arg(cmakeExecutable.displayName()); .arg(parameters.sourceDirectory.displayName()).arg(cmakeExecutable.displayName());
BuildSystem::appendBuildSystemOutput(addCMakePrefix({msg, QString()}).join('\n')); BuildSystem::appendBuildSystemOutput(addCMakePrefix({QString(), msg}).join('\n'));
emit finished(failedToStartExitCode); emit finished(failedToStartExitCode);
return; return;
} }
@@ -70,7 +70,7 @@ void CMakeProcess::run(const BuildDirParameters &parameters, const QStringList &
const QString msg = ::CMakeProjectManager::Tr::tr( const QString msg = ::CMakeProjectManager::Tr::tr(
"The build directory %1 is not reachable by the CMake executable %2.") "The build directory %1 is not reachable by the CMake executable %2.")
.arg(parameters.buildDirectory.displayName()).arg(cmakeExecutable.displayName()); .arg(parameters.buildDirectory.displayName()).arg(cmakeExecutable.displayName());
BuildSystem::appendBuildSystemOutput(addCMakePrefix({msg, QString()}).join('\n')); BuildSystem::appendBuildSystemOutput(addCMakePrefix({QString(), msg}).join('\n'));
emit finished(failedToStartExitCode); emit finished(failedToStartExitCode);
return; return;
} }
@@ -81,7 +81,7 @@ void CMakeProcess::run(const BuildDirParameters &parameters, const QStringList &
if (!buildDirectory.exists()) { if (!buildDirectory.exists()) {
const QString msg = ::CMakeProjectManager::Tr::tr( const QString msg = ::CMakeProjectManager::Tr::tr(
"The build directory \"%1\" does not exist").arg(buildDirectory.toUserOutput()); "The build directory \"%1\" does not exist").arg(buildDirectory.toUserOutput());
BuildSystem::appendBuildSystemOutput(addCMakePrefix({msg, QString()}).join('\n')); BuildSystem::appendBuildSystemOutput(addCMakePrefix({QString(), msg}).join('\n'));
emit finished(failedToStartExitCode); emit finished(failedToStartExitCode);
return; return;
} }
@@ -91,7 +91,7 @@ void CMakeProcess::run(const BuildDirParameters &parameters, const QStringList &
const QString msg = ::CMakeProjectManager::Tr::tr( const QString msg = ::CMakeProjectManager::Tr::tr(
"CMake executable \"%1\" and build directory \"%2\" must be on the same device.") "CMake executable \"%1\" and build directory \"%2\" must be on the same device.")
.arg(cmake->cmakeExecutable().toUserOutput(), buildDirectory.toUserOutput()); .arg(cmake->cmakeExecutable().toUserOutput(), buildDirectory.toUserOutput());
BuildSystem::appendBuildSystemOutput(addCMakePrefix({msg, QString()}).join('\n')); BuildSystem::appendBuildSystemOutput(addCMakePrefix({QString(), msg}).join('\n'));
emit finished(failedToStartExitCode); emit finished(failedToStartExitCode);
return; return;
} }
@@ -174,14 +174,14 @@ void CMakeProcess::handleProcessDone(const Utils::ProcessResultData &resultData)
} }
if (!msg.isEmpty()) { if (!msg.isEmpty()) {
BuildSystem::appendBuildSystemOutput(addCMakePrefix({msg, QString()}).join('\n')); BuildSystem::appendBuildSystemOutput(addCMakePrefix({QString(), msg}).join('\n'));
TaskHub::addTask(BuildSystemTask(Task::Error, msg)); TaskHub::addTask(BuildSystemTask(Task::Error, msg));
} }
emit finished(code); emit finished(code);
const QString elapsedTime = Utils::formatElapsedTime(m_elapsed.elapsed()); const QString elapsedTime = Utils::formatElapsedTime(m_elapsed.elapsed());
BuildSystem::appendBuildSystemOutput(addCMakePrefix({elapsedTime, QString()}).join('\n')); BuildSystem::appendBuildSystemOutput(addCMakePrefix({QString(), elapsedTime}).join('\n'));
} }
QString addCMakePrefix(const QString &str) QString addCMakePrefix(const QString &str)