[Cmake-commits] CMake branch, next, updated. v2.8.12-4927-g80542b5

[Peter Kuemmel]

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  80542b5f0bd6cc4d85a1e0526828a79a7166dd4e (commit)
       via  a6221394dd5094f1aa9aa5959fc6d413cb1129b0 (commit)
      from  2f9c1e53c754425d60ca8c459497f6cf24fdb1b4 (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=80542b5f0bd6cc4d85a1e0526828a79a7166dd4e
commit 80542b5f0bd6cc4d85a1e0526828a79a7166dd4e
Merge: 2f9c1e5 a622139
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Tue Nov 5 13:22:35 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 5 13:22:35 2013 -0500

    Merge topic 'ninja-edit-cache' into next
    
    a622139 Revert "Ninja: run cmake-gui for target edit_cache"


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a6221394dd5094f1aa9aa5959fc6d413cb1129b0
commit a6221394dd5094f1aa9aa5959fc6d413cb1129b0
Author:     Peter Kümmel <syntheticpp at gmx.net>
AuthorDate: Tue Nov 5 19:21:32 2013 +0100
Commit:     Peter Kümmel <syntheticpp at gmx.net>
CommitDate: Tue Nov 5 19:21:32 2013 +0100

    Revert "Ninja: run cmake-gui for target edit_cache"
    
    This reverts commit 0a39685fa6a986eae86ca9868e44cbc38da3cddf.

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 16d80e4..dd7311e 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -2046,11 +2046,6 @@ void cmGlobalGenerator::SetCMakeInstance(cmake* cm)
   this->CMakeInstance = cm;
 }
 
-const char* cmGlobalGenerator::GetEditCacheCommand(cmMakefile* mf) const
-{
-  return mf->GetDefinition("CMAKE_EDIT_COMMAND");
-}
-
 void cmGlobalGenerator::CreateDefaultGlobalTargets(cmTargets* targets)
 {
   cmMakefile* mf = this->LocalGenerators[0]->GetMakefile();
@@ -2157,9 +2152,9 @@ void cmGlobalGenerator::CreateDefaultGlobalTargets(cmTargets* targets)
 
     // Use CMAKE_EDIT_COMMAND for the edit_cache rule if it is defined.
     // Otherwise default to the interactive command-line interface.
-    if (this->GetEditCacheCommand(mf))
+    if(mf->GetDefinition("CMAKE_EDIT_COMMAND"))
       {
-      singleLine.push_back(this->GetEditCacheCommand(mf));
+      singleLine.push_back(mf->GetDefinition("CMAKE_EDIT_COMMAND"));
       singleLine.push_back("-H$(CMAKE_SOURCE_DIR)");
       singleLine.push_back("-B$(CMAKE_BINARY_DIR)");
       cpackCommandLines.push_back(singleLine);
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index cae3ff5..4d6e10f 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -409,8 +409,6 @@ private:
   typedef std::map<cmTarget *, TargetDependSet> TargetDependMap;
   TargetDependMap TargetDependencies;
 
-  virtual const char* GetEditCacheCommand(cmMakefile* mf) const;
-
   // Per-target generator information.
   cmGeneratorTargetsType GeneratorTargets;
   void CreateGeneratorTargets();
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx
index 6e45f21..d262397 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -1199,10 +1199,3 @@ void cmGlobalNinjaGenerator::WriteTargetHelp(std::ostream& os)
              /*orderOnlyDeps=*/ cmNinjaDeps(),
              /*variables=*/ cmNinjaVars());
 }
-
-
-const char* cmGlobalNinjaGenerator::GetEditCacheCommand(cmMakefile* mf) const
-{
-  const char* cmd = mf->GetDefinition("CMAKE_EDIT_COMMAND");
-  return cmd ? cmd : "cmake-gui";
-}
diff --git a/Source/cmGlobalNinjaGenerator.h b/Source/cmGlobalNinjaGenerator.h
index 03d0252..be58df1 100644
--- a/Source/cmGlobalNinjaGenerator.h
+++ b/Source/cmGlobalNinjaGenerator.h
@@ -222,7 +222,6 @@ public:
   }
   virtual const char* GetCleanTargetName()         const { return "clean"; }
 
-  virtual const char* GetEditCacheCommand(cmMakefile* mf) const;
 
   cmGeneratedFileStream* GetBuildFileStream() const {
     return this->BuildFileStream; }

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

Summary of changes:
 Source/cmGlobalGenerator.cxx      |    9 ++-------
 Source/cmGlobalGenerator.h        |    2 --
 Source/cmGlobalNinjaGenerator.cxx |    7 -------
 Source/cmGlobalNinjaGenerator.h   |    1 -
 4 files changed, 2 insertions(+), 17 deletions(-)


hooks/post-receive
-- 
CMake