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

[cmake-commits at cmake.org]

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

Modified Files:
	cmake.cxx 
Log Message:
Handle embeded manifests with ifort.


Index: cmake.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmake.cxx,v
retrieving revision 1.420
retrieving revision 1.421
diff -C 2 -d -r1.420 -r1.421
*** cmake.cxx	24 Aug 2009 13:54:27 -0000	1.420
--- cmake.cxx	1 Sep 2009 18:10:49 -0000	1.421
***************
*** 4155,4159 ****
      return -1;
      }
!   std::string manifestArg = "/MANIFESTFILE:";
    std::vector<cmStdString> rcCommand;
    rcCommand.push_back(cmSystemTools::FindProgram("rc.exe"));
--- 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"));