[Cmake-commits] CMake branch, next, updated. v2.8.12-4827-g7e551eb

[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  7e551ebaa64302843d31770fa0e116f931b5bb3d (commit)
       via  4dc41c1865c74bd0bc191ab07488c5fac479802c (commit)
      from  16d8630a82203f01ddd17fc2f5150b265752bb19 (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=7e551ebaa64302843d31770fa0e116f931b5bb3d
commit 7e551ebaa64302843d31770fa0e116f931b5bb3d
Merge: 16d8630 4dc41c1
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Mon Nov 4 06:40:31 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Nov 4 06:40:31 2013 -0500

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


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4dc41c1865c74bd0bc191ab07488c5fac479802c
commit 4dc41c1865c74bd0bc191ab07488c5fac479802c
Author:     Peter Kümmel <syntheticpp at gmx.net>
AuthorDate: Mon Nov 4 12:34:19 2013 +0100
Commit:     Peter Kümmel <syntheticpp at gmx.net>
CommitDate: Mon Nov 4 12:34:25 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/Modules/CMakeGenericSystem.cmake b/Modules/CMakeGenericSystem.cmake
index 8a14aea..a7e22fc 100644
--- a/Modules/CMakeGenericSystem.cmake
+++ b/Modules/CMakeGenericSystem.cmake
@@ -65,6 +65,7 @@ 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 4fe5033..f626232 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 cache editor...",
+          editCacheTargetName, "Running cmake-gui ...",
           &cpackCommandLines, depends, 0);
       }
     else

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

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


hooks/post-receive
-- 
CMake