summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2013-02-19 21:02:29 (GMT)
committerBrad King <brad.king@kitware.com>2013-02-19 21:06:38 (GMT)
commit781ea6d1ca03a11a40a92363e99637a6f20a6a69 (patch)
tree2d7161911cc12853203dbd2b5f7bf6499f5a10e7
parent6535fcefeba1b068bc3a1cac980a8b042a50d44b (diff)
downloadCMake-781ea6d1ca03a11a40a92363e99637a6f20a6a69.zip
CMake-781ea6d1ca03a11a40a92363e99637a6f20a6a69.tar.gz
CMake-781ea6d1ca03a11a40a92363e99637a6f20a6a69.tar.bz2
Xcode: Drop check for circular target dependencies
The modern cmComputeTargetDepends guarantees there will by no cycles. Drop the Xcode generator's check which only handled length 1 and 2 cycles anyway.
-rw-r--r--Source/cmGlobalXCodeGenerator.cxx18
1 files changed, 0 insertions, 18 deletions
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 9600771..fb8eafc 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -2517,24 +2517,6 @@ std::string cmGlobalXCodeGenerator::GetOrCreateId(const char* name,
void cmGlobalXCodeGenerator::AddDependTarget(cmXCodeObject* target,
cmXCodeObject* dependTarget)
{
- // make sure a target does not depend on itself
- if(target == dependTarget)
- {
- return;
- }
- // now avoid circular references if dependTarget already
- // depends on target then skip it. Circular references crashes
- // xcode
- cmXCodeObject* dependTargetDepends =
- dependTarget->GetObject("dependencies");
- if(dependTargetDepends)
- {
- if(dependTargetDepends->HasObject(target->GetPBXTargetDependency()))
- {
- return;
- }
- }
-
cmXCodeObject* targetdep = dependTarget->GetPBXTargetDependency();
if(!targetdep)
{