From b2fe7c9ad16f877ff61c6ce262f23b84180733e8 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Tue, 25 Apr 2017 15:55:23 +0200 Subject: [PATCH] CMake: Use canonical source directory when talking to cmake server-mode Use the canonical form of the source directory when talking to cmake. Cmake will save the canonical source directory in its settings and will fail if that is not passed in again. Change-Id: I1ea578053c8d5136d09b3f503443bd0188ebca4f Reviewed-by: hjk Reviewed-by: Tim Jenssen --- src/plugins/cmakeprojectmanager/servermode.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/cmakeprojectmanager/servermode.cpp b/src/plugins/cmakeprojectmanager/servermode.cpp index 473b58ed656..04f7ac9c299 100644 --- a/src/plugins/cmakeprojectmanager/servermode.cpp +++ b/src/plugins/cmakeprojectmanager/servermode.cpp @@ -464,7 +464,7 @@ void ServerMode::handleHello(const QVariantMap &data) if (m_minorProtocol >= 0) version.insert("minor", m_minorProtocol); extra.insert("protocolVersion", version); - extra.insert("sourceDirectory", m_sourceDirectory.toString()); + extra.insert("sourceDirectory", m_sourceDirectory.toFileInfo().canonicalFilePath()); extra.insert("buildDirectory", m_buildDirectory.toString()); extra.insert("generator", m_generator); if (!m_platform.isEmpty())