浏览代码

ENH:
-enable colored output with the kdevelop generator
-create non-verbose makefiles and have kdevelop call "VERBOSE=1 make" instead

Alex

Alexander Neundorf 17 年之前
父节点
当前提交
4f88f7e4de
共有 1 个文件被更改,包括 4 次插入4 次删除
  1. 4 4
      Source/cmGlobalKdevelopGenerator.cxx

+ 4 - 4
Source/cmGlobalKdevelopGenerator.cxx

@@ -59,8 +59,6 @@ void cmGlobalKdevelopGenerator::SetGlobalGenerator(
   cmExternalMakefileProjectGenerator::SetGlobalGenerator(generator);
   cmGlobalUnixMakefileGenerator3* mf = (cmGlobalUnixMakefileGenerator3*)
                                                                      generator;
-  mf->SetToolSupportsColor(false);
-  mf->SetForceVerboseMakefiles(true);
 }
 
 void cmGlobalKdevelopGenerator::Generate()
@@ -474,13 +472,15 @@ void cmGlobalKdevelopGenerator
         "    </run>\n"
         "    <build>\n"
         "      <buildtool>make</buildtool>\n"; //this one is important
-  fout<<"      <builddir>"<<outputDir.c_str()<<"</builddir>\n"; //and this one
+  fout<<"      <builddir>"<<outputDir.c_str()<<"</builddir>\n";  //and this one
   fout<<"    </build>\n"
         "    <make>\n"
         "      <abortonerror>false</abortonerror>\n"
         "      <numberofjobs>1</numberofjobs>\n"
         "      <dontact>false</dontact>\n"
-        "      <makebin></makebin>\n"
+        "      <makebin>VERBOSE=1 " << 
+            this->GlobalGenerator->GetLocalGenerators()[0]->GetMakefile()->
+            GetRequiredDefinition("CMAKE_BUILD_TOOL") << "</makebin>\n"
         "      <selectedenvironment>default</selectedenvironment>\n"
         "      <environments>\n"
         "        <default/>\n"