[Cmake-commits] CMake branch, next, updated. v2.8.12-4931-g5cb35e8

[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  5cb35e87647d05c7a79b5c5ba7d9bff0165b6fbd (commit)
       via  e6d2bdfcc2ff54ba482bfdfa028066b8b9a77f78 (commit)
      from  3b1f5e611b76bfb61b89a8469df512387a643d1e (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=5cb35e87647d05c7a79b5c5ba7d9bff0165b6fbd
commit 5cb35e87647d05c7a79b5c5ba7d9bff0165b6fbd
Merge: 3b1f5e6 e6d2bdf
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Tue Nov 5 13:35:51 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 5 13:35:51 2013 -0500

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


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e6d2bdfcc2ff54ba482bfdfa028066b8b9a77f78
commit e6d2bdfcc2ff54ba482bfdfa028066b8b9a77f78
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:24:27 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..cae3ff5 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* mf) const;
+
   // Per-target generator information.
   cmGeneratorTargetsType GeneratorTargets;
   void CreateGeneratorTargets();
diff --git a/Source/cmGlobalNinjaGenerator.h b/Source/cmGlobalNinjaGenerator.h
index be58df1..e557b82 100644
--- a/Source/cmGlobalNinjaGenerator.h
+++ b/Source/cmGlobalNinjaGenerator.h
@@ -222,6 +222,8 @@ 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, 11 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake