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 b7d4cf5e6c29cda3b7d5b8ddb142aedaaab3792e (commit)
via 4193f1ed9736a430047c1abd7631191dc86c3dc6 (commit)
from 7fbc4621aac27762fed30449189bdb2fe680d12d (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=b7d4cf5e6c29cda3b7d5b8ddb142aedaaab3792e
commit b7d4cf5e6c29cda3b7d5b8ddb142aedaaab3792e
Merge: 7fbc462 4193f1e
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Nov 12 09:02:56 2013 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Nov 12 09:02:56 2013 -0500
Merge topic 'ninja-edit-cache' into next
4193f1e Revert "Ninja: run cmake-gui for target edit_cache"
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4193f1ed9736a430047c1abd7631191dc86c3dc6
commit 4193f1ed9736a430047c1abd7631191dc86c3dc6
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Nov 12 09:02:26 2013 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Tue Nov 12 09:02:26 2013 -0500
Revert "Ninja: run cmake-gui for target edit_cache"
This reverts commit 5369a023eeafe7bee367fed74f62f8321ebc4e4c.
It will be replaced by a more general change.
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 7be5123..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*) const;
-
// Per-target generator information.
cmGeneratorTargetsType GeneratorTargets;
void CreateGeneratorTargets();
diff --git a/Source/cmGlobalNinjaGenerator.h b/Source/cmGlobalNinjaGenerator.h
index 0133b06..be58df1 100644
--- a/Source/cmGlobalNinjaGenerator.h
+++ b/Source/cmGlobalNinjaGenerator.h
@@ -222,9 +222,6 @@ 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, 2 insertions(+), 12 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
