[Cmake-commits] CMake branch, next, updated. v2.8.12-4870-gcd2e22d

[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  cd2e22d33985b4db2aee112473ca1f86575884a6 (commit)
       via  7b29f18472faea8300b92463cc4f046f71d475e3 (commit)
      from  14e747219e33d8ce8e4e344b62a21084ffcf20b9 (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=cd2e22d33985b4db2aee112473ca1f86575884a6
commit cd2e22d33985b4db2aee112473ca1f86575884a6
Merge: 14e7472 7b29f18
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Tue Nov 5 04:35:32 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 5 04:35:32 2013 -0500

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


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

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

diff --git a/Modules/CMakeGenericSystem.cmake b/Modules/CMakeGenericSystem.cmake
index a7e22fc..8a14aea 100644
--- a/Modules/CMakeGenericSystem.cmake
+++ b/Modules/CMakeGenericSystem.cmake
@@ -65,7 +65,6 @@ if(CMAKE_GENERATOR MATCHES "Ninja")
     "Enable/Disable output of compile commands during generation."
     )
   mark_as_advanced(CMAKE_EXPORT_COMPILE_COMMANDS)
-  set(CMAKE_EDIT_COMMAND cmake-gui CACHE STRING "use cmake-gui for target edit_cache" FORCE)
 endif()
 
 # GetDefaultWindowsPrefixBase
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index f626232..4fe5033 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -2152,7 +2152,7 @@ void cmGlobalGenerator::CreateDefaultGlobalTargets(cmTargets* targets)
       cpackCommandLines.push_back(singleLine);
       (*targets)[editCacheTargetName] =
         this->CreateGlobalTarget(
-          editCacheTargetName, "Running cmake-gui ...",
+          editCacheTargetName, "Running CMake cache editor...",
           &cpackCommandLines, depends, 0);
       }
     else

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

Summary of changes:
 Modules/CMakeGenericSystem.cmake |    1 -
 Source/cmGlobalGenerator.cxx     |    2 +-
 2 files changed, 1 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake