From f539ff1fcff62abbab464b5898ae658a13299766 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Fri, 8 Jan 2016 14:43:10 +0100 Subject: [PATCH] CMake: Document all arguments passed to cmake Do not leave out -Csomething (set by the kit) or the generator used (set by the wizard). Change-Id: I41cfb935da2877deaa26ae84bfdd96948fa20763 Reviewed-by: Niels Weber Reviewed-by: Tobias Hunger --- .../cmakeopenprojectwizard.cpp | 16 +++++++++------- .../cmakeprojectmanager/cmakeprojectmanager.cpp | 7 ++----- .../cmakeprojectmanager/cmakeprojectmanager.h | 3 +-- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp b/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp index 478503d2b0e..997caa44d04 100644 --- a/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp @@ -544,15 +544,17 @@ void CMakeRunPage::runCMake() QString arguments = m_argumentsLineEdit->text(); - m_output->appendPlainText(tr("Running: '%1' with arguments '%2' in '%3'.\n") - .arg(cmake->cmakeExecutable().toUserOutput()) - .arg(arguments) - .arg(QDir::toNativeSeparators(m_buildDirectory))); + 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("Running: '%1' with arguments '%2' in '%3'.
") + .arg(cmake->cmakeExecutable().toUserOutput()) + .arg(arguments) + .arg(QDir::toNativeSeparators(m_buildDirectory))); CMakeManager::createXmlFile(m_cmakeProcess, cmake->cmakeExecutable().toString(), arguments, m_cmakeWizard->sourceDirectory(), - m_buildDirectory, env, - QString::fromLatin1(generatorInfo.generatorArgument()), - generatorInfo.preLoadCacheFileArgument()); + m_buildDirectory, env); } else { m_runCMake->setEnabled(true); m_argumentsLineEdit->setEnabled(true); diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp index abbc43ee9fe..16e9cfa11b0 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp @@ -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(); } diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.h b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.h index 5d3440858e4..c9133978dee 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.h +++ b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.h @@ -60,8 +60,7 @@ public: static void createXmlFile(Utils::QtcProcess *process, 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); static bool preferNinja(); static QString findCbpFile(const QDir &);