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

CMake: Disable BC if there is an error during initial cmake run

Browse Source 
* Disable the BC and give report the cmake error
* Show a warning label in the BC

Change-Id: If5737d033fa2682c264ab7ac1189c59947e3b28d
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2016-02-11 16:33:15 +01:00
parent 744008ccf0
commit 0d10ce3834
7 changed files with 85 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/cmakeprojectmanager/builddirmanager.cpp
View File

@@ -451,6 +451,14 @@ CMakeConfig BuildDirManager::parseConfiguration() const
CMakeConfigItem::Type t = fromByteArray(type);
if (t != CMakeConfigItem::INTERNAL)
result << CMakeConfigItem(key, t, documentation, value);
// Sanity checks:
if (key == "CMAKE_HOME_DIRECTORY") {
const Utils::FileName actualSourceDir = Utils::FileName::fromUserInput(QString::fromUtf8(value));
if (actualSourceDir != m_sourceDir)
emit errorOccured(tr("Build directory contains a build of the wrong project (%1).")
.arg(actualSourceDir.toUserOutput()));
}
}
}