[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5799-g507731c

[Stephen Kelly]

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  507731c4d6c3bfc027e5efa0c3f0672c4dca2770 (commit)
       via  a60cd3d3c6b214a2c1271321c726fd21000a0cdb (commit)
      from  a2cec72ade8a1b0990ceb269bdea371527e2b7a5 (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=507731c4d6c3bfc027e5efa0c3f0672c4dca2770
commit 507731c4d6c3bfc027e5efa0c3f0672c4dca2770
Merge: a2cec72 a60cd3d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Nov 25 16:45:08 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Nov 25 16:45:08 2013 -0500

    Merge topic 'use-generator-target' into next
    
    a60cd3d cmGeneratorTarget: Use the output directory to order cmTargets.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a60cd3d3c6b214a2c1271321c726fd21000a0cdb
commit a60cd3d3c6b214a2c1271321c726fd21000a0cdb
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Nov 25 21:13:10 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Nov 25 21:13:10 2013 +0100

    cmGeneratorTarget: Use the output directory to order cmTargets.
    
    The output directory must be unique, but the source directory
    of an add_subdirectory call may be re-used.

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;
 }

-----------------------------------------------------------------------

Summary of changes:
 Source/cmGeneratorTarget.cxx |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake