[Cmake-commits] CMake branch, next, updated. v2.8.12-4939-g848c2ba

[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  848c2baff623d4d7418af97df1bba5fc58c86d13 (commit)
       via  03ad2a8a63bf9f2ae0b7abf03633a98dd4d841ad (commit)
      from  e61035e3a3cbb9b6491bf97f9e47421586466848 (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=848c2baff623d4d7418af97df1bba5fc58c86d13
commit 848c2baff623d4d7418af97df1bba5fc58c86d13
Merge: e61035e 03ad2a8
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Tue Nov 5 13:46:33 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 5 13:46:33 2013 -0500

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


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

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

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.h b/Source/cmGlobalNinjaGenerator.h
index e557b82..be58df1 100644
--- a/Source/cmGlobalNinjaGenerator.h
+++ b/Source/cmGlobalNinjaGenerator.h
@@ -222,8 +222,6 @@ public:
   }
   virtual const char* GetCleanTargetName()         const { return "clean"; }
 
-  virtual const char* GetEditCacheCommand(cmMakefile* mf) const {
-    return "cmake-gui"; }
 
   cmGeneratedFileStream* GetBuildFileStream() const {
     return this->BuildFileStream; }

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

Summary of changes:
 Source/cmGlobalGenerator.cxx    |    9 ++-------
 Source/cmGlobalGenerator.h      |    2 --
 Source/cmGlobalNinjaGenerator.h |    2 --
 3 files changed, 2 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
CMake