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

CMake server-mode: Make sure the target's source dir is absolute

Browse Source 
Change-Id: I3c74e3a0ee9c854e4b97826a4397579d4755d8e0
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Tobias Hunger
2019-06-20 14:00:33 +02:00
parent 67186c761f
commit d6d133da42
1 changed files with 29 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/cmakeprojectmanager/servermodereader.cpp
View File

@@ -195,7 +195,9 @@ bool ServerModeReader::isParsing() const
QList<CMakeBuildTarget> ServerModeReader::takeBuildTargets(QString &errorMessage) QList<CMakeBuildTarget> ServerModeReader::takeBuildTargets(QString &errorMessage)
{ {
Q_UNUSED(errorMessage) Q_UNUSED(errorMessage)
const QList<CMakeBuildTarget> result = transform(m_targets, [](const Target *t) -> CMakeBuildTarget { QDir topSourceDir(m_parameters.sourceDirectory.toString());
const QList<CMakeBuildTarget> result
= transform(m_targets, [&topSourceDir](const Target *t) -> CMakeBuildTarget {
CMakeBuildTarget ct; CMakeBuildTarget ct;
ct.title = t->name; ct.title = t->name;
ct.executable = t->artifacts.isEmpty() ? FilePath() : t->artifacts.at(0); ct.executable = t->artifacts.isEmpty() ? FilePath() : t->artifacts.at(0);
@@ -215,9 +217,11 @@ QList<CMakeBuildTarget> ServerModeReader::takeBuildTargets(QString &errorMessage
if (t->artifacts.isEmpty()) { if (t->artifacts.isEmpty()) {
ct.workingDirectory = t->buildDirectory; ct.workingDirectory = t->buildDirectory;
} else { } else {
ct.workingDirectory = Utils::FilePath::fromString(t->artifacts.at(0).toFileInfo().absolutePath()); ct.workingDirectory = Utils::FilePath::fromString(
t->artifacts.at(0).toFileInfo().absolutePath());
} }
ct.sourceDirectory = t->sourceDirectory; ct.sourceDirectory = FilePath::fromString(
QDir::cleanPath(topSourceDir.absoluteFilePath(t->sourceDirectory.toString())));
return ct; return ct;
}); });
m_targets.clear(); m_targets.clear();