diff options
| author | Alex Neundorf <neundorf@kde.org> | 2013-12-29 07:00:24 +0100 |
|---|---|---|
| committer | Alex Neundorf <neundorf@kde.org> | 2013-12-29 21:17:25 +0100 |
| commit | 424d5dc07844ee7ef21776e32caaf137b33f8358 (patch) | |
| tree | f9b4ddedcfdc135a221c18ea8e7ccbcf93d74b59 /Source/cmExtraKateGenerator.cxx | |
| parent | 8bd6cf0f33feed20d9ac5e8a7f8dd946b3589ff1 (diff) | |
| download | cmake-424d5dc07844ee7ef21776e32caaf137b33f8358.tar.gz | |
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
Diffstat (limited to 'Source/cmExtraKateGenerator.cxx')
| -rw-r--r-- | Source/cmExtraKateGenerator.cxx | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/Source/cmExtraKateGenerator.cxx b/Source/cmExtraKateGenerator.cxx index 8399fe842f..ba67fdacb9 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); |