[cmake-commits] hoffman committed CMakeLists.txt 1.319 1.320 cmGlobalKdevelopGenerator.cxx 1.19 1.20 cmLocalKdevelopGenerator.cxx 1.19 NONE cmLocalKdevelopGenerator.h 1.7 NONE cmLocalUnixMakefileGenerator3.h 1.64 1.65

[cmake-commits at cmake.org]

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

Modified Files:
	CMakeLists.txt cmGlobalKdevelopGenerator.cxx 
	cmLocalUnixMakefileGenerator3.h 
Removed Files:
	cmLocalKdevelopGenerator.cxx cmLocalKdevelopGenerator.h 
Log Message:
BUG: fix for 4186, kdevelop adding file twice


Index: cmLocalUnixMakefileGenerator3.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalUnixMakefileGenerator3.h,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- cmLocalUnixMakefileGenerator3.h	25 Oct 2006 15:23:03 -0000	1.64
+++ cmLocalUnixMakefileGenerator3.h	25 Jan 2007 20:44:52 -0000	1.65
@@ -51,18 +51,6 @@
   virtual void Generate();
 
   
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
   // this returns the relative path between the HomeOutputDirectory and this
   // local generators StartOutputDirectory
   const std::string &GetHomeRelativeOutputPath();
@@ -136,6 +124,15 @@
   void SetSilentNoColon(bool v)  {this->SilentNoColon = v;}
 
   /**
+   * If set to true, the CMake variable CMAKE_VERBOSE_MAKEFILES doesn't have
+   * anymore. Set it to true when writing a generator where short output
+   * doesn't make sense, e.g. because the full output is parsed by an
+   * IDE/editor.
+   */
+  void SetForceVerboseMakefiles(bool enable) 
+    {this->ForceVerboseMakefiles=enable;}
+
+  /**
    * Set the command to use for native make shell echo.  The value
    * should include all parts of the command up to the beginning of
    * the message (including a whitespace separator).
@@ -267,19 +264,6 @@
   void WriteDirectoryInformationFile();
 
 
-  
-
-
-
-
-
-
-
-
-
-
-
-
   // write the depend info 
   void WriteDependLanguageInfo(std::ostream& cmakefileStream, cmTarget &tgt);
   

--- cmLocalKdevelopGenerator.cxx DELETED ---

Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CMakeLists.txt,v
retrieving revision 1.319
retrieving revision 1.320
diff -u -d -r1.319 -r1.320
--- CMakeLists.txt	10 Jan 2007 20:30:26 -0000	1.319
+++ CMakeLists.txt	25 Jan 2007 20:44:52 -0000	1.320
@@ -175,8 +175,7 @@
 # Kdevelop only works on UNIX and not windows
 IF(UNIX)
   SET(SRCS ${SRCS}
-    cmGlobalKdevelopGenerator.cxx
-    cmLocalKdevelopGenerator.cxx)
+    cmGlobalKdevelopGenerator.cxx)
 ENDIF(UNIX)
 # XCode only works on apple
 IF(APPLE)

Index: cmGlobalKdevelopGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalKdevelopGenerator.cxx,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- cmGlobalKdevelopGenerator.cxx	3 Oct 2006 13:12:27 -0000	1.19
+++ cmGlobalKdevelopGenerator.cxx	25 Jan 2007 20:44:52 -0000	1.20
@@ -17,7 +17,7 @@
 =========================================================================*/
 
 #include "cmGlobalKdevelopGenerator.h"
-#include "cmLocalKdevelopGenerator.h"
+#include "cmLocalUnixMakefileGenerator3.h"
 #include "cmMakefile.h"
 #include "cmake.h"
 #include "cmSourceFile.h"
@@ -36,7 +36,8 @@
 ///! Create a local generator appropriate to this Global Generator
 cmLocalGenerator *cmGlobalKdevelopGenerator::CreateLocalGenerator()
 {
-  cmLocalGenerator *lg = new cmLocalKdevelopGenerator;
+  cmLocalUnixMakefileGenerator3 *lg = new cmLocalUnixMakefileGenerator3;
+  lg->SetForceVerboseMakefiles(true);
   lg->SetGlobalGenerator(this);
   return lg;
 }
@@ -185,6 +186,7 @@
             hname += *ext;
             if(cmSystemTools::FileExists(hname.c_str()))
               {
+              cmSystemTools::ReplaceString(hname, projectDir.c_str(), "");
               files.insert(hname);
               break;
               }

--- cmLocalKdevelopGenerator.h DELETED ---