[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-976-g7c4e65d

[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  7c4e65d58164fddae72ec6032c99a44d590a6a17 (commit)
       via  a3d76607e5792c80ad64dfc871ea1be4a78103dc (commit)
      from  cca5ff777f4f8208c2fdf0ab3b0df387816db97d (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=7c4e65d58164fddae72ec6032c99a44d590a6a17
commit 7c4e65d58164fddae72ec6032c99a44d590a6a17
Merge: cca5ff7 a3d7660
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Mar 13 10:39:46 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Mar 13 10:39:46 2014 -0400

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


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

    Revert "Add cruft already in next but no other topic"
    
    This reverts commit d78497914d99429f9571b09a9f90a66ae8ff2b8c.

diff --git a/Source/cmLocalUnixMakefileGenerator3.h b/Source/cmLocalUnixMakefileGenerator3.h
index e75103c..d504247 100644
--- a/Source/cmLocalUnixMakefileGenerator3.h
+++ b/Source/cmLocalUnixMakefileGenerator3.h
@@ -317,14 +317,6 @@ 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:
 Source/cmLocalUnixMakefileGenerator3.h |    8 --------
 1 file changed, 8 deletions(-)


hooks/post-receive
-- 
CMake