[Cmake-commits] CMake branch, next, updated. v2.8.12-4587-gd76d2e6

[Brad King]

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  d76d2e6f6e74d803c1121aaa923762a94e6ea596 (commit)
       via  3d7ff74545b1c169ecf8832579d456e5c32cec83 (commit)
       via  5198f1fd46d7883cb3b59a6572f6379450043eda (commit)
      from  9ed638ece68dce8a33b9e0b9d5a7eb975da84620 (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=d76d2e6f6e74d803c1121aaa923762a94e6ea596
commit d76d2e6f6e74d803c1121aaa923762a94e6ea596
Merge: 9ed638e 3d7ff74
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 28 16:31:00 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 28 16:31:00 2013 -0400

    Merge topic 'use-generator-target' into next
    
    3d7ff74 cmTarget: Workaround Borland Internal Compiler Error
    5198f1f cmTarget: Declare classes before making them friends


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3d7ff74545b1c169ecf8832579d456e5c32cec83
commit 3d7ff74545b1c169ecf8832579d456e5c32cec83
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 28 16:16:30 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Oct 28 16:18:14 2013 -0400

    cmTarget: Workaround Borland Internal Compiler Error
    
    Declare cmTarget::SourceEntry and SourceEntriesType earlier in the
    private section.  For some reason Borland 5.5 crashes otherwise.

diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 935c50a..99ef0c4 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -566,6 +566,9 @@ private:
 
   std::vector<std::pair<TLLSignature, cmListFileBacktrace> > TLLCommands;
 
+  struct SourceEntry { std::vector<cmSourceFile*> Depends; };
+  typedef std::map<cmSourceFile*, SourceEntry> SourceEntriesType;
+
   /**
    * A list of direct dependencies. Use in conjunction with DependencyMap.
    */
@@ -654,9 +657,6 @@ private:
                                        const char* config,
                                        bool contentOnly);
 
-  struct SourceEntry { std::vector<cmSourceFile*> Depends; };
-  typedef std::map<cmSourceFile*, SourceEntry> SourceEntriesType;
-
   SourceEntriesType GetSourceEntries() const;
 
 private:

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5198f1fd46d7883cb3b59a6572f6379450043eda
commit 5198f1fd46d7883cb3b59a6572f6379450043eda
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 28 16:07:17 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Oct 28 16:18:12 2013 -0400

    cmTarget: Declare classes before making them friends
    
    Declare cmGeneratorTarget and cmTargetTraceDependencies in cmTarget.h
    before making them friends of cmTarget.

diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 59563c5..935c50a 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -34,6 +34,8 @@ class cmGlobalGenerator;
 class cmComputeLinkInformation;
 class cmListFileBacktrace;
 class cmTarget;
+class cmGeneratorTarget;
+class cmTargetTraceDependencies;
 
 struct cmTargetLinkInformationMap:
   public std::map<std::pair<cmTarget*, std::string>, cmComputeLinkInformation*>

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

Summary of changes:
 Source/cmTarget.h |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake