[Cmake-commits] CMake branch, next, updated. v2.8.12-4941-g3129f6c

[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  3129f6cc2966fda1b44ffa728219a1d33db7312a (commit)
       via  5369a023eeafe7bee367fed74f62f8321ebc4e4c (commit)
      from  848c2baff623d4d7418af97df1bba5fc58c86d13 (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=3129f6cc2966fda1b44ffa728219a1d33db7312a
commit 3129f6cc2966fda1b44ffa728219a1d33db7312a
Merge: 848c2ba 5369a02
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Tue Nov 5 13:49:57 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 5 13:49:57 2013 -0500

    Merge topic 'ninja-edit-cache' into next
    
    5369a02 Ninja: run cmake-gui for target edit_cache


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5369a023eeafe7bee367fed74f62f8321ebc4e4c
commit 5369a023eeafe7bee367fed74f62f8321ebc4e4c
Author:     Peter Kümmel <syntheticpp at gmx.net>
AuthorDate: Tue Nov 5 17:35:18 2013 +0100
Commit:     Peter Kümmel <syntheticpp at gmx.net>
CommitDate: Tue Nov 5 19:49:04 2013 +0100

    Ninja: run cmake-gui for target edit_cache
    
    Ninja can't run commands interactively,
    this will never work with ninja by design,
    so start cmake-gui instead.
    
    http://cmake.org/Bug/view.php?id=14544

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index dd7311e..16d80e4 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -2046,6 +2046,11 @@ 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();
@@ -2152,9 +2157,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(mf->GetDefinition("CMAKE_EDIT_COMMAND"))
+    if (this->GetEditCacheCommand(mf))
       {
-      singleLine.push_back(mf->GetDefinition("CMAKE_EDIT_COMMAND"));
+      singleLine.push_back(this->GetEditCacheCommand(mf));
       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 4d6e10f..7be5123 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -409,6 +409,8 @@ private:
   typedef std::map<cmTarget *, TargetDependSet> TargetDependMap;
   TargetDependMap TargetDependencies;
 
+  virtual const char* GetEditCacheCommand(cmMakefile*) const;
+
   // Per-target generator information.
   cmGeneratorTargetsType GeneratorTargets;
   void CreateGeneratorTargets();
diff --git a/Source/cmGlobalNinjaGenerator.h b/Source/cmGlobalNinjaGenerator.h
index be58df1..0133b06 100644
--- a/Source/cmGlobalNinjaGenerator.h
+++ b/Source/cmGlobalNinjaGenerator.h
@@ -222,6 +222,9 @@ public:
   }
   virtual const char* GetCleanTargetName()         const { return "clean"; }
 
+  virtual const char* GetEditCacheCommand(cmMakefile*) const {
+    return "cmake-gui";
+  }
 
   cmGeneratedFileStream* GetBuildFileStream() const {
     return this->BuildFileStream; }

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

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


hooks/post-receive
-- 
CMake