[Cmake-commits] CMake branch, next, updated. v3.3.0-rc1-207-g553626c

[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  553626cab6cb2a9173422359f2e1e62d1912c6b9 (commit)
       via  34e1d6db722b34bb6b4f7b8a7ea53a0bb61c5f58 (commit)
       via  54cb76f299ebcdd07e59d3d0c61f1aa0ffe03a33 (commit)
      from  2c96d8121c0b5d524d432361f1e628eccffd5f72 (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=553626cab6cb2a9173422359f2e1e62d1912c6b9
commit 553626cab6cb2a9173422359f2e1e62d1912c6b9
Merge: 2c96d81 34e1d6d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Jun 7 05:00:25 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Jun 7 05:00:25 2015 -0400

    Merge topic 'data-layout' into next
    
    34e1d6db cmCustomCommand: Re-arrange data layout.
    54cb76f2 cmComputeLinkDepends: Re-arrange data layout.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=34e1d6db722b34bb6b4f7b8a7ea53a0bb61c5f58
commit 34e1d6db722b34bb6b4f7b8a7ea53a0bb61c5f58
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Jun 7 10:44:59 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Jun 7 10:48:15 2015 +0200

    cmCustomCommand: Re-arrange data layout.
    
    Size goes from 240 to 224 bytes.

diff --git a/Source/cmCustomCommand.cxx b/Source/cmCustomCommand.cxx
index 4032b08..7418413 100644
--- a/Source/cmCustomCommand.cxx
+++ b/Source/cmCustomCommand.cxx
@@ -31,12 +31,12 @@ cmCustomCommand::cmCustomCommand(const cmCustomCommand& r):
   Byproducts(r.Byproducts),
   Depends(r.Depends),
   CommandLines(r.CommandLines),
-  HaveComment(r.HaveComment),
+  Backtrace(r.Backtrace),
   Comment(r.Comment),
   WorkingDirectory(r.WorkingDirectory),
+  HaveComment(r.HaveComment),
   EscapeAllowMakeVars(r.EscapeAllowMakeVars),
   EscapeOldStyle(r.EscapeOldStyle),
-  Backtrace(r.Backtrace),
   UsesTerminal(r.UsesTerminal)
 {
 }
@@ -77,15 +77,13 @@ cmCustomCommand::cmCustomCommand(cmMakefile const* mf,
   Byproducts(byproducts),
   Depends(depends),
   CommandLines(commandLines),
-  HaveComment(comment?true:false),
+  Backtrace(),
   Comment(comment?comment:""),
   WorkingDirectory(workingDirectory?workingDirectory:""),
+  HaveComment(comment?true:false),
   EscapeAllowMakeVars(false),
-  EscapeOldStyle(true),
-  Backtrace()
+  EscapeOldStyle(true)
 {
-  this->EscapeOldStyle = true;
-  this->EscapeAllowMakeVars = false;
   if(mf)
     {
     this->Backtrace = mf->GetBacktrace();
diff --git a/Source/cmCustomCommand.h b/Source/cmCustomCommand.h
index 0bfaef2..cc5501f 100644
--- a/Source/cmCustomCommand.h
+++ b/Source/cmCustomCommand.h
@@ -93,13 +93,13 @@ private:
   std::vector<std::string> Byproducts;
   std::vector<std::string> Depends;
   cmCustomCommandLines CommandLines;
-  bool HaveComment;
+  cmListFileBacktrace Backtrace;
+  ImplicitDependsList ImplicitDepends;
   std::string Comment;
   std::string WorkingDirectory;
+  bool HaveComment;
   bool EscapeAllowMakeVars;
   bool EscapeOldStyle;
-  cmListFileBacktrace Backtrace;
-  ImplicitDependsList ImplicitDepends;
   bool UsesTerminal;
 };
 

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=54cb76f299ebcdd07e59d3d0c61f1aa0ffe03a33
commit 54cb76f299ebcdd07e59d3d0c61f1aa0ffe03a33
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Jun 7 10:41:16 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Jun 7 10:41:47 2015 +0200

    cmComputeLinkDepends: Re-arrange data layout.
    
    Size goes from 648 to 632 bytes.

diff --git a/Source/cmComputeLinkDepends.h b/Source/cmComputeLinkDepends.h
index 09b9d70..51a08c5 100644
--- a/Source/cmComputeLinkDepends.h
+++ b/Source/cmComputeLinkDepends.h
@@ -61,14 +61,7 @@ private:
   cmMakefile* Makefile;
   cmGlobalGenerator const* GlobalGenerator;
   cmake* CMakeInstance;
-  bool DebugMode;
-
-  // Configuration information.
-  bool HasConfig;
   std::string Config;
-  cmTarget::LinkLibraryType LinkType;
-
-  // Output information.
   EntryVector FinalLinkEntries;
 
   typedef cmTarget::LinkLibraryVectorType LinkLibraryVectorType;
@@ -131,7 +124,7 @@ private:
   void OrderLinkEntires();
   std::vector<char> ComponentVisited;
   std::vector<int> ComponentOrder;
-  int ComponentOrderId;
+
   struct PendingComponent
   {
     // The real component id.  Needed because the map is indexed by
@@ -158,11 +151,14 @@ private:
 
   // Record of the original link line.
   std::vector<int> OriginalEntries;
+  std::set<cmTarget const*> OldWrongConfigItems;
+  void CheckWrongConfigItem(cmLinkItem const& item);
 
-  // Compatibility help.
+  int ComponentOrderId;
+  cmTarget::LinkLibraryType LinkType;
+  bool HasConfig;
+  bool DebugMode;
   bool OldLinkDirMode;
-  void CheckWrongConfigItem(cmLinkItem const& item);
-  std::set<cmTarget const*> OldWrongConfigItems;
 };
 
 #endif

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

Summary of changes:
 Source/cmComputeLinkDepends.h |   18 +++++++-----------
 Source/cmCustomCommand.cxx    |   12 +++++-------
 Source/cmCustomCommand.h      |    6 +++---
 3 files changed, 15 insertions(+), 21 deletions(-)


hooks/post-receive
-- 
CMake