[Cmake-commits] CMake branch, next, updated. v2.8.5-1656-g64e5935
David Cole
david.cole at kitware.com
Fri Aug 19 11:38:20 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 64e5935c1331f6764364fcc6f55c8f1fb9e0244e (commit)
via bda4148a571d969700e018d89a95547908075bec (commit)
via 8971c0d8d287cc0024cc0a5ea12c947adfda207c (commit)
from d83c92643c29de57059eb4a01e41f42f2cafcd5b (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=64e5935c1331f6764364fcc6f55c8f1fb9e0244e
commit 64e5935c1331f6764364fcc6f55c8f1fb9e0244e
Merge: d83c926 bda4148
Author: David Cole <david.cole at kitware.com>
AuthorDate: Fri Aug 19 11:38:15 2011 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Aug 19 11:38:15 2011 -0400
Merge topic 'xcode4-remove-PREBINDING' into next
bda4148 Xcode: Remove PREBINDING attribute for Xcode 4 and above
8971c0d KWSys Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bda4148a571d969700e018d89a95547908075bec
commit bda4148a571d969700e018d89a95547908075bec
Author: Johan Bjork <phb at spotify.com>
AuthorDate: Thu Aug 18 18:28:15 2011 +0200
Commit: David Cole <david.cole at kitware.com>
CommitDate: Fri Aug 19 11:27:26 2011 -0400
Xcode: Remove PREBINDING attribute for Xcode 4 and above
PREBINDING is obsolete in Xcode 4 and causes warnings if present.
Do not emit it for Xcode >= 4.0
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index fd9dacd..7396791 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -1758,7 +1758,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
default:
break;
}
- if(this->XcodeVersion >= 22)
+ if(this->XcodeVersion >= 22 && this->XcodeVersion < 40)
{
buildSettings->AddAttribute("PREBINDING",
this->CreateString("NO"));
-----------------------------------------------------------------------
Summary of changes:
Source/cmGlobalXCodeGenerator.cxx | 2 +-
Source/kwsys/kwsysDateStamp.cmake | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list