Просмотр исходного кода

COMP: fix warning about unused mf
-"make VERBOSE=1 <target>" should be more portable than
"VERBOSE=1 make <target>", since it doesn't rely on the shell, shouldn't it ?

Alex

Alexander Neundorf 17 лет назад
Родитель
Сommit
d64600127b
2 измененных файлов с 3 добавлено и 13 удалено
  1. 3 12
      Source/cmGlobalKdevelopGenerator.cxx
  2. 0 1
      Source/cmGlobalKdevelopGenerator.h

+ 3 - 12
Source/cmGlobalKdevelopGenerator.cxx

@@ -52,15 +52,6 @@ cmGlobalKdevelopGenerator::cmGlobalKdevelopGenerator()
   this->SupportedGlobalGenerators.push_back("Unix Makefiles");
 }
 
-
-void cmGlobalKdevelopGenerator::SetGlobalGenerator(
-                                                  cmGlobalGenerator* generator)
-{
-  cmExternalMakefileProjectGenerator::SetGlobalGenerator(generator);
-  cmGlobalUnixMakefileGenerator3* mf = (cmGlobalUnixMakefileGenerator3*)
-                                                                     generator;
-}
-
 void cmGlobalKdevelopGenerator::Generate()
 {
   // for each sub project in the project create 
@@ -478,9 +469,9 @@ void cmGlobalKdevelopGenerator
         "      <abortonerror>false</abortonerror>\n"
         "      <numberofjobs>1</numberofjobs>\n"
         "      <dontact>false</dontact>\n"
-        "      <makebin>VERBOSE=1 " << 
-            this->GlobalGenerator->GetLocalGenerators()[0]->GetMakefile()->
-            GetRequiredDefinition("CMAKE_BUILD_TOOL") << "</makebin>\n"
+        "      <makebin>" << this->GlobalGenerator->GetLocalGenerators()[0]->
+            GetMakefile()->GetRequiredDefinition("CMAKE_BUILD_TOOL") 
+            << " VERBOSE=1 </makebin>\n"
         "      <selectedenvironment>default</selectedenvironment>\n"
         "      <environments>\n"
         "        <default/>\n"

+ 0 - 1
Source/cmGlobalKdevelopGenerator.h

@@ -37,7 +37,6 @@ class cmGlobalKdevelopGenerator : public cmExternalMakefileProjectGenerator
 {
 public:
   cmGlobalKdevelopGenerator();
-  virtual void SetGlobalGenerator(cmGlobalGenerator* generator);
 
   virtual const char* GetName() const
                           { return cmGlobalKdevelopGenerator::GetActualName();}