Revert "Ninja: don't expand any rsp files"

This reverts commit 5598d9b2a06d4ec788b5e058435bb3bba99fd517.

Since commit f1670ab1 (Ninja: don't confuse ninja's rsp files with
nmake's, 2012-09-26) Ninja generator response files are placed in
CMakeFiles/ so the previously existing check already avoids expanding
them.

1 files changed, 7 insertions, 15 deletions

diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 6cb7aa4..745d513 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -1683,19 +1683,11 @@ int cmake::ExecuteCMakeCommand(std::vector<std::string>& args)
       }
     else if (args[1] == "vs_link_exe")
       {
-      return cmake::VisualStudioLink(args, 1, false);
+      return cmake::VisualStudioLink(args, 1);
       }
     else if (args[1] == "vs_link_dll")
       {
-      return cmake::VisualStudioLink(args, 2, false);
-      }
-    else if (args[1] == "vs_link_exe_no_rsp_expand")
-      {
-      return cmake::VisualStudioLink(args, 1, true);
-      }
-    else if (args[1] == "vs_link_dll_no_rsp_expand")
-      {
-      return cmake::VisualStudioLink(args, 2, true);
+      return cmake::VisualStudioLink(args, 2);
       }
 #ifdef CMAKE_BUILD_WITH_CMAKE
     // Internal CMake color makefile support.
@@ -4021,8 +4013,7 @@ static bool cmakeCheckStampList(const char* stampList)
 // For visual studio 2005 and newer manifest files need to be embeded into
 // exe and dll's.  This code does that in such a way that incremental linking
 // still works.
-int cmake::VisualStudioLink(std::vector<std::string>& args, int type,
-                            bool no_rsp_expand)
+int cmake::VisualStudioLink(std::vector<std::string>& args, int type)
 {
   if(args.size() < 2)
     {
@@ -4037,12 +4028,13 @@ int cmake::VisualStudioLink(std::vector<std::string>& args, int type,
   for(std::vector<std::string>::iterator i = args.begin();
       i != args.end(); ++i)
     {
-    // check for nmake temporary files (there are two rsp files)
-    if(!no_rsp_expand && (*i)[0] == '@' && i->find("@CMakeFiles") != 0 )
+    // check for nmake temporary files
+    if((*i)[0] == '@' && i->find("@CMakeFiles") != 0 )
       {
       std::ifstream fin(i->substr(1).c_str());
       std::string line;
-      while(cmSystemTools::GetLineFromStream(fin, line))
+      while(cmSystemTools::GetLineFromStream(fin,
+                                             line))
         {
         cmSystemTools::ParseWindowsCommandLine(line.c_str(), expandedArgs);
         }