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.

2 files changed, 5 insertions, 15 deletions

diff --git a/Modules/Platform/Windows-bcc32.cmake b/Modules/Platform/Windows-bcc32.cmake
index 2060dc2..fa4813e 100644
--- a/Modules/Platform/Windows-bcc32.cmake
+++ b/Modules/Platform/Windows-bcc32.cmake
@@ -57,7 +57,7 @@ SET(CMAKE_C_CREATE_SHARED_LIBRARY
   ${CMAKE_C_CREATE_IMPORT_LIBRARY})
 
 # create a C++ static library
-SET(CMAKE_CXX_CREATE_STATIC_LIBRARY  "tlib ${CMAKE_START_TEMP_FILE}/p512 <LINK_FLAGS> /a <TARGET_QUOTED> <OBJECTS_QUOTED>${CMAKE_END_TEMP_FILE}")
+SET(CMAKE_CXX_CREATE_STATIC_LIBRARY  "tlib ${CMAKE_START_TEMP_FILE}/p512 <LINK_FLAGS> /a <TARGET> <OBJECTS>${CMAKE_END_TEMP_FILE}")
 
 # create a C static library
 SET(CMAKE_C_CREATE_STATIC_LIBRARY ${CMAKE_CXX_CREATE_STATIC_LIBRARY})
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index 08cf6df..f268ddf 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -1258,24 +1258,15 @@ public:
                                          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 @@ private:
   cmMakefile* Makefile;
   cmLocalUnixMakefileGenerator3* LocalGenerator;
   std::string::size_type LengthLimit;
-  bool NoQuotes;
   std::string CurrentString;
   std::string NextObject;
   const char* Space;