From 0bd7214e19d7b5dfcbc96abd35a29962a65b9375 Mon Sep 17 00:00:00 2001
From: dt <qtc-committer@nokia.com>
Date: Mon, 13 Sep 2010 14:09:46 +0100
Subject: [PATCH] CMake: Set up environment for cmake correctly
Task-Nr: QTCREATORBUG-1130
---
.../cmakeprojectmanager/cmakebuildconfiguration.cpp | 8 ++++++++
src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h | 2 ++
2 files changed, 10 insertions(+)
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
index 84c152ffdcd..8e7aac5d0e7 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
@@ -169,6 +169,14 @@ ProjectExplorer::IOutputParser *CMakeBuildConfiguration::createOutputParser() co
return 0;
}
+Utils::Environment CMakeBuildConfiguration::baseEnvironment() const
+{
+ Utils::Environment env = BuildConfiguration::baseEnvironment();
+ if (m_toolChain)
+ m_toolChain->addToEnvironment(env);
+ return env;
+}
+
/*!
\class CMakeBuildConfigurationFactory
*/
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h
index 867838c46bc..ba13d14c66b 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h
+++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h
@@ -64,6 +64,8 @@ public:
ProjectExplorer::IOutputParser *createOutputParser() const;
+ Utils::Environment baseEnvironment() const;
+
signals:
void msvcVersionChanged();
--
GitLab