CMake: Set up environment for cmake correctly

Task-Nr: QTCREATORBUG-1130

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
 */

src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h

@@ -64,6 +64,8 @@ public:
 
     ProjectExplorer::IOutputParser *createOutputParser() const;
 
+    Utils::Environment baseEnvironment() const;
+
 signals:
     void msvcVersionChanged();