[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-974-gcca5ff7

[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  cca5ff777f4f8208c2fdf0ab3b0df387816db97d (commit)
       via  d78497914d99429f9571b09a9f90a66ae8ff2b8c (commit)
      from  96d9f18a4ecda60feb212508eb37b289740c10d0 (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=cca5ff777f4f8208c2fdf0ab3b0df387816db97d
commit cca5ff777f4f8208c2fdf0ab3b0df387816db97d
Merge: 96d9f18 d784979
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Mar 13 10:39:22 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Mar 13 10:39:22 2014 -0400

    Merge topic 'remove-auto-merge-cruft-from-next' into next
    
    d7849791 Add cruft already in next but no other topic


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d78497914d99429f9571b09a9f90a66ae8ff2b8c
commit d78497914d99429f9571b09a9f90a66ae8ff2b8c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Mar 13 10:38:35 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Mar 13 10:38:35 2014 -0400

    Add cruft already in next but no other topic
    
    A sequence of multiple merges and reverts of a topic in 'next' left
    behind some extra content in 'Source/cmLocalUnixMakefileGenerator3.h'.
    Add it here and merge to 'next' so we can then revert it.

diff --git a/Source/cmLocalUnixMakefileGenerator3.h b/Source/cmLocalUnixMakefileGenerator3.h
index d504247..e75103c 100644
--- a/Source/cmLocalUnixMakefileGenerator3.h
+++ b/Source/cmLocalUnixMakefileGenerator3.h
@@ -317,6 +317,14 @@ private:
   std::string MakeLauncher(cmCustomCommandGenerator const& ccg,
                            cmTarget* target, RelativeRoot relative);
 
+  virtual void ComputeObjectFilenames(
+                        std::map<cmSourceFile const*, std::string>& mapping,
+                        cmGeneratorTarget const* gt = 0);
+
+  virtual void ComputeObjectFilenames(
+                        std::map<cmSourceFile const*, std::string>& mapping,
+                        cmGeneratorTarget const* gt = 0);
+
   friend class cmMakefileTargetGenerator;
   friend class cmMakefileExecutableTargetGenerator;
   friend class cmMakefileLibraryTargetGenerator;

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

Summary of changes:


hooks/post-receive
-- 
CMake