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

CMake: Document all arguments passed to cmake

Browse Source 
Do not leave out -Csomething (set by the kit) or the generator used
(set by the wizard).

Change-Id: I41cfb935da2877deaa26ae84bfdd96948fa20763
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2016-01-08 14:43:10 +01:00
parent d144ea58e0
commit f539ff1fcf
3 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -147,8 +147,7 @@ bool CMakeManager::preferNinja()
// sounds like a plan
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, const QString &preloadCache)
const QDir &buildDirectory, const Utils::Environment &env)
{
QString buildDirectoryPath = buildDirectory.absolutePath();
buildDirectory.mkpath(buildDirectoryPath);
@@ -160,9 +159,7 @@ void CMakeManager::createXmlFile(Utils::QtcProcess *proc, const QString &executa
QString args;
Utils::QtcProcess::addArg(&args, srcdir);
Utils::QtcProcess::addArgs(&args, arguments);
Utils::QtcProcess::addArg(&args, generator);
if (!preloadCache.isEmpty())
Utils::QtcProcess::addArg(&args, preloadCache);
proc->setCommand(executable, args);
proc->start();
}