summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Cole <david.cole@kitware.com>2011-10-25 19:34:07 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2011-10-25 19:34:07 (GMT)
commit1df94c5a03a7a3dfb8c5b56d74e1aa0cd15a0ece (patch)
tree4f24cfee19f37118c39ab9b46f5a7c5d0b2b4a18
parent88b557892096d587bc2f18ff470bff3fcf673359 (diff)
parent5a94d099ddbd8f3d4b850957faa8c11f619c6f18 (diff)
downloadCMake-1df94c5a03a7a3dfb8c5b56d74e1aa0cd15a0ece.zip
CMake-1df94c5a03a7a3dfb8c5b56d74e1aa0cd15a0ece.tar.gz
CMake-1df94c5a03a7a3dfb8c5b56d74e1aa0cd15a0ece.tar.bz2
Merge topic 'fix-12522-avoid-xcode-env-spew'
5a94d09 Xcode: Avoid spewing the environment on every script run (#12522)
-rw-r--r--Source/cmGlobalXCodeGenerator.cxx5
1 files changed, 5 insertions, 0 deletions
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());