summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2013-11-26 14:38:18 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2013-11-26 14:38:18 (GMT)
commit235c2d26dca77507ab998d6c980827086989e27f (patch)
tree9e5ad3b03136aad9f0821eeb12677077df96292b
parent9498344c9d5bec0d1d644e9e512411973721fec4 (diff)
parenta60cd3d3c6b214a2c1271321c726fd21000a0cdb (diff)
downloadCMake-235c2d26dca77507ab998d6c980827086989e27f.zip
CMake-235c2d26dca77507ab998d6c980827086989e27f.tar.gz
CMake-235c2d26dca77507ab998d6c980827086989e27f.tar.bz2
Merge topic 'use-generator-target'
a60cd3d cmGeneratorTarget: Use the output directory to order cmTargets.
-rw-r--r--Source/cmGeneratorTarget.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 90cca1b..5a535c7 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -698,8 +698,8 @@ bool cmStrictTargetComparison::operator()(cmTarget *t1, cmTarget *t2) const
int nameResult = strcmp(t1->GetName(), t2->GetName());
if (nameResult == 0)
{
- return strcmp(t1->GetMakefile()->GetStartDirectory(),
- t2->GetMakefile()->GetStartDirectory()) < 0;
+ return strcmp(t1->GetMakefile()->GetStartOutputDirectory(),
+ t2->GetMakefile()->GetStartOutputDirectory()) < 0;
}
return nameResult < 0;
}