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

CMake: Fix comparison of source paths when importing

Browse Source 
We need to check canonical paths with canonical paths.
Otherwise we get a mismatch when using e.g. a linked directory for the
source path on the command line and then try to import the build in Qt
Creator.

Change-Id: I153be74b6cfdf5070e023780604ce64c92df0e6d
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
This commit is contained in:
Eike Ziller
2020-08-18 13:21:58 +02:00
parent 22fcfb0d6f
commit 9df06af9bd
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp
View File

@@ -245,8 +245,10 @@ QList<void *> CMakeProjectImporter::examineDirectory(const Utils::FilePath &impo
qCDebug(cmInputLog) << "Failed to read configuration from" << cacheFile << errorMessage; qCDebug(cmInputLog) << "Failed to read configuration from" << cacheFile << errorMessage;
return { }; return { };
} }
const auto homeDir const auto homeDir = Utils::FilePath::fromUserInput(
= Utils::FilePath::fromUserInput(QString::fromUtf8(CMakeConfigItem::valueOf("CMAKE_HOME_DIRECTORY", config))); QString::fromUtf8(
CMakeConfigItem::valueOf("CMAKE_HOME_DIRECTORY", config)))
.canonicalPath();
const Utils::FilePath canonicalProjectDirectory = projectDirectory().canonicalPath(); const Utils::FilePath canonicalProjectDirectory = projectDirectory().canonicalPath();
if (homeDir != canonicalProjectDirectory) { if (homeDir != canonicalProjectDirectory) {
qCDebug(cmInputLog) << "Wrong source directory:" << homeDir.toUserOutput() qCDebug(cmInputLog) << "Wrong source directory:" << homeDir.toUserOutput()