[Cmake-commits] [cmake-commits] hoffman committed cmake.cxx 1.421 1.422

[cmake-commits at cmake.org]

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

Modified Files:
	cmake.cxx 
Log Message:
Move /MANIFEST flag into -E vs_link.  This is so it can be used by the intel compilers without having to specifiy it in the intel compiler files 


Index: cmake.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmake.cxx,v
retrieving revision 1.421
retrieving revision 1.422
diff -C 2 -d -r1.421 -r1.422
*** cmake.cxx	1 Sep 2009 18:10:49 -0000	1.421
--- cmake.cxx	1 Sep 2009 18:33:26 -0000	1.422
***************
*** 4155,4165 ****
      return -1;
      }
!   std::string link = cmSystemTools::LowerCase(linkCommand[0]);
!   std::string manifestArg;
!   if(link.find("ifort") != link.npos)
!     {
!     manifestArg += "/MANIFEST ";
!     }
!   manifestArg += "/MANIFESTFILE:";
    std::vector<cmStdString> rcCommand;
    rcCommand.push_back(cmSystemTools::FindProgram("rc.exe"));
--- 4155,4159 ----
      return -1;
      }
!   std::string manifestArg = "/MANIFESTFILE:";
    std::vector<cmStdString> rcCommand;
    rcCommand.push_back(cmSystemTools::FindProgram("rc.exe"));
***************
*** 4189,4192 ****
--- 4183,4187 ----
    manifestArg += tempManifest;
    // add the manifest arg to the linkCommand
+   linkCommand.push_back("/MANIFEST");
    linkCommand.push_back(manifestArg);
    // if manifestFile is not yet created, create an