[Cmake-commits] [cmake-commits] alex committed cmGlobalKdevelopGenerator.h 1.7 1.8 cmGlobalKdevelopGenerator.cxx 1.30 1.31

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv22570

Modified Files:
	cmGlobalKdevelopGenerator.h cmGlobalKdevelopGenerator.cxx 
Log Message:
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


Index: cmGlobalKdevelopGenerator.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalKdevelopGenerator.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C 2 -d -r1.7 -r1.8
*** cmGlobalKdevelopGenerator.h	26 Aug 2007 23:27:33 -0000	1.7
--- cmGlobalKdevelopGenerator.h	27 Mar 2008 21:40:43 -0000	1.8
***************
*** 38,42 ****
  public:
    cmGlobalKdevelopGenerator();
-   virtual void SetGlobalGenerator(cmGlobalGenerator* generator);
  
    virtual const char* GetName() const
--- 38,41 ----

Index: cmGlobalKdevelopGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalKdevelopGenerator.cxx,v
retrieving revision 1.30
retrieving revision 1.31
diff -C 2 -d -r1.30 -r1.31
*** cmGlobalKdevelopGenerator.cxx	27 Mar 2008 19:33:09 -0000	1.30
--- cmGlobalKdevelopGenerator.cxx	27 Mar 2008 21:40:43 -0000	1.31
***************
*** 53,65 ****
  }
  
- 
- void cmGlobalKdevelopGenerator::SetGlobalGenerator(
-                                                   cmGlobalGenerator* generator)
- {
-   cmExternalMakefileProjectGenerator::SetGlobalGenerator(generator);
-   cmGlobalUnixMakefileGenerator3* mf = (cmGlobalUnixMakefileGenerator3*)
-                                                                      generator;
- }
- 
  void cmGlobalKdevelopGenerator::Generate()
  {
--- 53,56 ----
***************
*** 479,485 ****
          "      <numberofjobs>1</numberofjobs>\n"
          "      <dontact>false</dontact>\n"
!         "      <makebin>VERBOSE=1 " << 
!             this->GlobalGenerator->GetLocalGenerators()[0]->GetMakefile()->
!             GetRequiredDefinition("CMAKE_BUILD_TOOL") << "</makebin>\n"
          "      <selectedenvironment>default</selectedenvironment>\n"
          "      <environments>\n"
--- 470,476 ----
          "      <numberofjobs>1</numberofjobs>\n"
          "      <dontact>false</dontact>\n"
!         "      <makebin>" << this->GlobalGenerator->GetLocalGenerators()[0]->
!             GetMakefile()->GetRequiredDefinition("CMAKE_BUILD_TOOL") 
!             << " VERBOSE=1 </makebin>\n"
          "      <selectedenvironment>default</selectedenvironment>\n"
          "      <environments>\n"