diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp index 84c152ffdcd87d1b25d3e1b3c6ce41eefcc50988..8e7aac5d0e7bb7f16283aa3d3aefffa66edd9bd8 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 867838c46bc9f2e9cb6a242359c9bbd2c6c299ca..ba13d14c66b15002f9351bdade2372c5f1419680 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();