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

10
src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
View File

@@ -544,15 +544,17 @@ void CMakeRunPage::runCMake()
QString arguments = m_argumentsLineEdit->text(); QString arguments = m_argumentsLineEdit->text();
m_output->appendPlainText(tr("Running: '%1' with arguments '%2' in '%3'.\n") Utils::QtcProcess::addArg(&arguments, QString::fromLatin1(generatorInfo.generatorArgument()));
const QString preloadCache = generatorInfo.preLoadCacheFileArgument();
if (!preloadCache.isEmpty())
Utils::QtcProcess::addArg(&arguments, preloadCache);
m_output->appendHtml(tr("<b>Running: '%1' with arguments '%2' in '%3'.</b><br>")
.arg(cmake->cmakeExecutable().toUserOutput()) .arg(cmake->cmakeExecutable().toUserOutput())
.arg(arguments) .arg(arguments)
.arg(QDir::toNativeSeparators(m_buildDirectory))); .arg(QDir::toNativeSeparators(m_buildDirectory)));
CMakeManager::createXmlFile(m_cmakeProcess, cmake->cmakeExecutable().toString(), CMakeManager::createXmlFile(m_cmakeProcess, cmake->cmakeExecutable().toString(),
arguments, m_cmakeWizard->sourceDirectory(), arguments, m_cmakeWizard->sourceDirectory(),
m_buildDirectory, env, m_buildDirectory, env);
QString::fromLatin1(generatorInfo.generatorArgument()),
generatorInfo.preLoadCacheFileArgument());
} else { } else {
m_runCMake->setEnabled(true); m_runCMake->setEnabled(true);
m_argumentsLineEdit->setEnabled(true); m_argumentsLineEdit->setEnabled(true);

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

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

3
src/plugins/cmakeprojectmanager/cmakeprojectmanager.h
View File

@@ -60,8 +60,7 @@ public:
static void createXmlFile(Utils::QtcProcess *process, const QString &executable, static void createXmlFile(Utils::QtcProcess *process, const QString &executable,
const QString &arguments, const QString &sourceDirectory, const QString &arguments, const QString &sourceDirectory,
const QDir &buildDirectory, const Utils::Environment &env, const QDir &buildDirectory, const Utils::Environment &env);
const QString &generator, const QString &preloadCache);
static bool preferNinja(); static bool preferNinja();
static QString findCbpFile(const QDir &); static QString findCbpFile(const QDir &);