[Cmake-commits] CMake branch, next, updated. v2.8.5-1775-g3e6e82e
David Cole
david.cole at kitware.com
Thu Sep 1 10:36:54 EDT 2011
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 3e6e82e9d89d1062ece2f1ea1432246ff8410660 (commit)
via 57bc42ae91ce373db094e69a6f9900aadbe858fe (commit)
from 2145e2ac47607e0922875fb287968bb14158baf4 (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=3e6e82e9d89d1062ece2f1ea1432246ff8410660
commit 3e6e82e9d89d1062ece2f1ea1432246ff8410660
Merge: 2145e2a 57bc42a
Author: David Cole <david.cole at kitware.com>
AuthorDate: Thu Sep 1 10:36:52 2011 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Sep 1 10:36:52 2011 -0400
Merge topic 'fix-zero-check-mistake' into next
57bc42a Xcode: Do not emit the ZERO_CHECK target more than once
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=57bc42ae91ce373db094e69a6f9900aadbe858fe
commit 57bc42ae91ce373db094e69a6f9900aadbe858fe
Author: Johan Bjork <phb at spotify.com>
AuthorDate: Sun Aug 28 12:24:00 2011 +0200
Commit: David Cole <david.cole at kitware.com>
CommitDate: Thu Sep 1 09:59:44 2011 -0400
Xcode: Do not emit the ZERO_CHECK target more than once
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index f67b029..3e35048 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -770,7 +770,8 @@ cmGlobalXCodeGenerator::CreateXCodeFileReference(cmSourceFile* sf,
bool cmGlobalXCodeGenerator::SpecialTargetEmitted(std::string const& tname)
{
if(tname == "ALL_BUILD" || tname == "XCODE_DEPEND_HELPER" ||
- tname == "install" || tname == "package" || tname == "RUN_TESTS" )
+ tname == "install" || tname == "package" || tname == "RUN_TESTS" ||
+ tname == CMAKE_CHECK_BUILD_SYSTEM_TARGET )
{
if(this->TargetDoneSet.find(tname) != this->TargetDoneSet.end())
{
-----------------------------------------------------------------------
Summary of changes:
Source/cmGlobalXCodeGenerator.cxx | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list