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 c1dcb1959714cf1018506f1dd3417e764cd1c132 (commit)
via 37104d97b012574ab4d3725a077611e2d31e1547 (commit)
via 424d5dc07844ee7ef21776e32caaf137b33f8358 (commit)
via 8bd6cf0f33feed20d9ac5e8a7f8dd946b3589ff1 (commit)
via 8b275894da09fb4e9793163f1b330d9289ee020e (commit)
via a8466700136e446136eca8529e1e1c4aade6a2ec (commit)
via 9f7c2bde8f1541089c9b39d8bf54f98a9f36c3ae (commit)
from 846a1b77380abf97cbd06aefa1a4792f044a9de6 (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=c1dcb1959714cf1018506f1dd3417e764cd1c132
commit c1dcb1959714cf1018506f1dd3417e764cd1c132
Merge: 846a1b7 37104d9
Author: Alexander Neundorf <neund...@kde.org>
AuthorDate: Mon Dec 30 16:59:06 2013 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Dec 30 16:59:06 2013 -0500
Merge topic 'KateProjectImprovements' into next
37104d9 kate: put full path to cmake into comment
424d5dc kate: support also the build plugin in kate <= 4.12
8bd6cf0 kate: the prev_target is not used by kate
8b27589 CMake Nightly Date Stamp
a846670 CMake Nightly Date Stamp
9f7c2bd CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=37104d97b012574ab4d3725a077611e2d31e1547
commit 37104d97b012574ab4d3725a077611e2d31e1547
Author: Alex Neundorf <neund...@kde.org>
AuthorDate: Sun Dec 29 07:07:59 2013 +0100
Commit: Alex Neundorf <neund...@kde.org>
CommitDate: Sun Dec 29 21:17:32 2013 +0100
kate: put full path to cmake into comment
Alex
diff --git a/Source/cmExtraKateGenerator.cxx b/Source/cmExtraKateGenerator.cxx
index ba67fda..0312488 100644
--- a/Source/cmExtraKateGenerator.cxx
+++ b/Source/cmExtraKateGenerator.cxx
@@ -247,7 +247,8 @@ cmExtraKateGenerator::CreateDummyKateProjectFile(const
cmMakefile* mf) const
return;
}
- fout << "#Generated by cmake, do not edit.\n";
+ fout << "#Generated by " << mf->GetRequiredDefinition("CMAKE_COMMAND")
+ << ", do not edit.\n";
}
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=424d5dc07844ee7ef21776e32caaf137b33f8358
commit 424d5dc07844ee7ef21776e32caaf137b33f8358
Author: Alex Neundorf <neund...@kde.org>
AuthorDate: Sun Dec 29 07:00:24 2013 +0100
Commit: Alex Neundorf <neund...@kde.org>
CommitDate: Sun Dec 29 21:17:25 2013 +0100
kate: support also the build plugin in kate <= 4.12
With this patch, simply also the information used
by the build plugin in kate <= 4.12 is put into the
generated json file. The new build plugin (coming
in 4.13) simply ignores this (and vice versa).
Alex
diff --git a/Source/cmExtraKateGenerator.cxx b/Source/cmExtraKateGenerator.cxx
index 8399fe8..ba67fda 100644
--- a/Source/cmExtraKateGenerator.cxx
+++ b/Source/cmExtraKateGenerator.cxx
@@ -86,17 +86,28 @@ void
cmExtraKateGenerator::WriteTargets(const cmMakefile* mf,
cmGeneratedFileStream& fout) const
{
+ const std::string make = mf->GetRequiredDefinition("CMAKE_MAKE_PROGRAM");
+ const std::string makeArgs = mf->GetSafeDefinition(
+ "CMAKE_KATE_MAKE_ARGUMENTS");
+ const char* homeOutputDir = mf->GetHomeOutputDirectory();
+
fout <<
"\t\"build\": {\n"
"\t\t\"directory\": \"" << mf->GetHomeOutputDirectory() << "\",\n"
"\t\t\"default_target\": \"all\",\n"
- "\t\t\"clean_target\": \"clean\",\n"
- "\t\t\"targets\":[\n";
+ "\t\t\"clean_target\": \"clean\",\n";
- const std::string make = mf->GetRequiredDefinition("CMAKE_MAKE_PROGRAM");
- const std::string makeArgs = mf->GetSafeDefinition(
- "CMAKE_KATE_MAKE_ARGUMENTS");
- const char* homeOutputDir = mf->GetHomeOutputDirectory();
+ // build, clean and quick are for the build plugin kate <= 4.12:
+ fout << "\t\t\"build\": \"" << make << " -C " << homeOutputDir
+ << " " << makeArgs << " " << "all\",\n";
+ fout << "\t\t\"clean\": \"" << make << " -C " << homeOutputDir
+ << " " << makeArgs << " " << "clean\",\n";
+ fout << "\t\t\"quick\": \"" << make << " -C " << homeOutputDir
+ << " " << makeArgs << " " << "install\",\n";
+
+ // this is for kate >= 4.13:
+ fout <<
+ "\t\t\"targets\":[\n";
this->AppendTarget(fout, "all", make, makeArgs,
homeOutputDir, homeOutputDir);
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8bd6cf0f33feed20d9ac5e8a7f8dd946b3589ff1
commit 8bd6cf0f33feed20d9ac5e8a7f8dd946b3589ff1
Author: Alex Neundorf <neund...@kde.org>
AuthorDate: Sun Dec 29 06:40:14 2013 +0100
Commit: Alex Neundorf <neund...@kde.org>
CommitDate: Sun Dec 29 06:40:14 2013 +0100
kate: the prev_target is not used by kate
...this was a leftover from experimenting
Alex
diff --git a/Source/cmExtraKateGenerator.cxx b/Source/cmExtraKateGenerator.cxx
index 177ef8d..8399fe8 100644
--- a/Source/cmExtraKateGenerator.cxx
+++ b/Source/cmExtraKateGenerator.cxx
@@ -90,7 +90,6 @@ cmExtraKateGenerator::WriteTargets(const cmMakefile* mf,
"\t\"build\": {\n"
"\t\t\"directory\": \"" << mf->GetHomeOutputDirectory() << "\",\n"
"\t\t\"default_target\": \"all\",\n"
- "\t\t\"prev_target\": \"all\",\n"
"\t\t\"clean_target\": \"clean\",\n"
"\t\t\"targets\":[\n";
-----------------------------------------------------------------------
Summary of changes:
Source/CMakeVersion.cmake | 2 +-
Source/cmExtraKateGenerator.cxx | 27 +++++++++++++++++++--------
2 files changed, 20 insertions(+), 9 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
