diff options
author | dt <[email protected]> | 2009-05-26 16:10:13 +0200 |
---|---|---|
committer | dt <[email protected]> | 2009-05-27 14:58:11 +0200 |
commit | adc7a7204b64ca305d3904386ebb616d3be48e4a (patch) | |
tree | 8cb415c7b41b351d68ea05b4e7a3ee5bea30f878 /src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp | |
parent | 14a79dad585285195986e6b289209a8063963767 (diff) |
Use the environment specified for the current build configuration to
rebuild the cbp file
I think that makes sense, we'll see.
Diffstat (limited to 'src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp')
-rw-r--r-- | src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp index 77dc18c5d30..52eea3068b6 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp @@ -96,7 +96,7 @@ QString CMakeManager::cmakeExecutable() 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 -QProcess *CMakeManager::createXmlFile(const QStringList &arguments, const QString &sourceDirectory, const QDir &buildDirectory) +QProcess *CMakeManager::createXmlFile(const QStringList &arguments, const QString &sourceDirectory, const QDir &buildDirectory, const ProjectExplorer::Environment &env) { // We create a cbp file, only if we didn't find a cbp file in the base directory // Yet that can still override cbp files in subdirectories @@ -113,6 +113,7 @@ QProcess *CMakeManager::createXmlFile(const QStringList &arguments, const QStrin QProcess *cmake = new QProcess; cmake->setWorkingDirectory(buildDirectoryPath); cmake->setProcessChannelMode(QProcess::MergedChannels); + cmake->setEnvironment(env.toStringList()); #ifdef Q_OS_WIN const QString generator = QLatin1String("-GCodeBlocks - MinGW Makefiles"); |