[cmake-commits] king committed cmMakefileTargetGenerator.cxx 1.91 1.92

[cmake-commits at cmake.org]

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

Modified Files:
	cmMakefileTargetGenerator.cxx 
Log Message:
ENH: Simplify make build rule generation by removing use of OBJECTS_QUOTED and TARGET_QUOTED rule variables and updating the generation of OBJECTS to always use the newer cmLocalGenerator::Convert method.


Index: cmMakefileTargetGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmMakefileTargetGenerator.cxx,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -d -r1.91 -r1.92
--- cmMakefileTargetGenerator.cxx	20 Feb 2008 19:56:29 -0000	1.91
+++ cmMakefileTargetGenerator.cxx	24 Feb 2008 19:05:21 -0000	1.92
@@ -1258,24 +1258,15 @@
                                          std::string::size_type limit):
     Strings(strings), Makefile(mf), LocalGenerator(lg), LengthLimit(limit)
     {
-    this->NoQuotes = mf->IsOn("CMAKE_NO_QUOTED_OBJECTS");
     this->Space = "";
     }
   void Feed(std::string const& obj)
     {
     // Construct the name of the next object.
-    if(this->NoQuotes)
-      {
-      this->NextObject =
-        this->LocalGenerator->Convert(obj.c_str(),
-                                      cmLocalGenerator::START_OUTPUT,
-                                      cmLocalGenerator::SHELL);
-      }
-    else
-      {
-      this->NextObject =
-        this->LocalGenerator->ConvertToQuotedOutputPath(obj.c_str());
-      }
+    this->NextObject =
+      this->LocalGenerator->Convert(obj.c_str(),
+                                    cmLocalGenerator::START_OUTPUT,
+                                    cmLocalGenerator::SHELL);
 
     // Roll over to next string if the limit will be exceeded.
     if(this->LengthLimit != std::string::npos &&
@@ -1303,7 +1294,6 @@
   cmMakefile* Makefile;
   cmLocalUnixMakefileGenerator3* LocalGenerator;
   std::string::size_type LengthLimit;
-  bool NoQuotes;
   std::string CurrentString;
   std::string NextObject;
   const char* Space;