[Cmake-commits] CMake branch, next, updated. v2.8.6-1607-g9217831

[David Cole]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  9217831a37d63bfb9d40af5ba23c121198c0d747 (commit)
       via  5a94d099ddbd8f3d4b850957faa8c11f619c6f18 (commit)
      from  51b2f74062eca6b6d85017bf5a96cb341ece9347 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9217831a37d63bfb9d40af5ba23c121198c0d747
commit 9217831a37d63bfb9d40af5ba23c121198c0d747
Merge: 51b2f74 5a94d09
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Fri Oct 21 10:52:22 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Oct 21 10:52:22 2011 -0400

    Merge topic 'fix-12522-avoid-xcode-env-spew' into next
    
    5a94d09 Xcode: Avoid spewing the environment on every script run (#12522)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5a94d099ddbd8f3d4b850957faa8c11f619c6f18
commit 5a94d099ddbd8f3d4b850957faa8c11f619c6f18
Author:     Johan Bjork <phb at spotify.com>
AuthorDate: Mon Oct 17 13:47:19 2011 +0200
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Thu Oct 20 19:14:28 2011 -0400

    Xcode: Avoid spewing the environment on every script run (#12522)
    
    This is the prefered way to get rid of the 'setenv XXX' output,
    instead of stripping it in the cmakexbuild wrapper.

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 09265ae..32eaef8 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -1328,6 +1328,8 @@ cmGlobalXCodeGenerator::AddCommandsToBuildPhase(cmXCodeObject* buildphase,
   cmSystemTools::ReplaceString(makecmd, "\\ ", "\\\\ ");
   buildphase->AddAttribute("shellScript",
                            this->CreateString(makecmd.c_str()));
+  buildphase->AddAttribute("showEnvVarsInLog",
+                           this->CreateString("0"));
 }
 
 //----------------------------------------------------------------------------
@@ -2065,6 +2067,9 @@ cmGlobalXCodeGenerator::CreateUtilityTarget(cmTarget& cmtarget)
   shellBuildPhase->AddAttribute("shellScript",
                                 this->CreateString(
                                   "# shell script goes here\nexit 0"));
+  shellBuildPhase->AddAttribute("showEnvVarsInLog",
+                                this->CreateString("0"));
+
   cmXCodeObject* target =
     this->CreateObject(cmXCodeObject::PBXAggregateTarget);
   target->SetComment(cmtarget.GetName());

-----------------------------------------------------------------------

Summary of changes:
 Source/cmGlobalXCodeGenerator.cxx |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake