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

Make CMakeTool known to the Kits

Browse Source 
This patch adds support for binding a specific CMakeTool to a Kit.
When creating a new Kit or loading a existing one without a valid
CMakeTool, the default CMakeTool will be set.

Change-Id: I28d0843a01c583c4b31fc680a0ec556b40cd9c0d
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
This commit is contained in:
Benjamin Zeller
2015-02-24 21:57:00 +01:00
parent 20a05c986c
commit 1e2d266541
20 changed files with 723 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
View File

@@ -128,38 +128,6 @@ QString CMakeManager::mimeType() const
return QLatin1String(Constants::CMAKEPROJECTMIMETYPE);
}
QString CMakeManager::cmakeExecutable() const
{
CMakeTool *cmake = CMakeToolManager::defaultCMakeTool();
if (cmake)
return cmake->cmakeExecutable().toString();
return QString();
}
bool CMakeManager::isCMakeExecutableValid() const
{
CMakeTool *cmake = CMakeToolManager::defaultCMakeTool();
if (cmake)
return cmake->isValid();
return false;
}
bool CMakeManager::hasCodeBlocksMsvcGenerator() const
{
CMakeTool *cmake = CMakeToolManager::defaultCMakeTool();
if (cmake)
return cmake->hasCodeBlocksMsvcGenerator();
return false;
}
bool CMakeManager::hasCodeBlocksNinjaGenerator() const
{
CMakeTool *cmake = CMakeToolManager::defaultCMakeTool();
if (cmake)
return cmake->hasCodeBlocksNinjaGenerator();
return false;
}
bool CMakeManager::preferNinja() const
{
return CMakeToolManager::preferNinja();
@@ -169,7 +137,7 @@ bool CMakeManager::preferNinja() const
// we probably want the process instead of this function
// cmakeproject then could even run the cmake process in the background, adding the files afterwards
// sounds like a plan
void CMakeManager::createXmlFile(Utils::QtcProcess *proc, const QString &arguments,
void CMakeManager::createXmlFile(Utils::QtcProcess *proc, const QString &executable, const QString &arguments,
const QString &sourceDirectory, const QDir &buildDirectory,
const Utils::Environment &env, const QString &generator)
{
@@ -184,7 +152,7 @@ void CMakeManager::createXmlFile(Utils::QtcProcess *proc, const QString &argumen
Utils::QtcProcess::addArg(&args, srcdir);
Utils::QtcProcess::addArgs(&args, arguments);
Utils::QtcProcess::addArg(&args, generator);
proc->setCommand(cmakeExecutable(), args);
proc->setCommand(executable, args);
proc->start();
}