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

CMake: add preload cache cmake script file per kit

Browse Source 
Change-Id: I51c33610f2eb300ef5de2e565c567d799eddc9cf
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
Tom Deblauwe
2015-10-26 12:07:44 +01:00
parent 6d4135d8f0
commit f6fcfb4c9a
11 changed files with 341 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -587,12 +587,16 @@ void CMakeRunPage::runCMake()
CMakeManager *cmakeManager = m_cmakeWizard->cmakeManager();
if (cmake && cmake->isValid()) {
m_cmakeProcess = new Utils::QtcProcess();
connect(m_cmakeProcess, SIGNAL(readyReadStandardOutput()), this, SLOT(cmakeReadyReadStandardOutput()));
connect(m_cmakeProcess, SIGNAL(readyReadStandardError()), this, SLOT(cmakeReadyReadStandardError()));
connect(m_cmakeProcess, SIGNAL(finished(int)), this, SLOT(cmakeFinished()));
connect(m_cmakeProcess, &QProcess::readyReadStandardOutput,
this, &CMakeRunPage::cmakeReadyReadStandardOutput);
connect(m_cmakeProcess, &QProcess::readyReadStandardError,
this, &CMakeRunPage::cmakeReadyReadStandardError);
connect(m_cmakeProcess, &QProcess::finished,
this, &CMakeRunPage::cmakeFinished);
cmakeManager->createXmlFile(m_cmakeProcess, cmake->cmakeExecutable().toString(), m_argumentsLineEdit->text(),
m_cmakeWizard->sourceDirectory(), m_buildDirectory, env,
QString::fromLatin1(generatorInfo.generatorArgument()));
QString::fromLatin1(generatorInfo.generatorArgument()),
QString::fromLatin1(generatorInfo.preLoadScriptFileArgument()));
} else {
m_runCMake->setEnabled(true);
m_argumentsLineEdit->setEnabled(true);