mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-08 07:10:12 -05:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Bill Hoffman
2009-09-01 14:33:26 -04:00
parent 5fa4784274
commit e9a170b108
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmake.cxx
+2 -7
View File
@@ -4154,13 +4154,7 @@ int cmake::VisualStudioLinkIncremental(std::vector<std::string>& args,
{
return -1;
}
std::string link = cmSystemTools::LowerCase(linkCommand[0]);
std::string manifestArg;
if(link.find("ifort") != link.npos)
{
manifestArg += "/MANIFEST ";
}
manifestArg += "/MANIFESTFILE:";
std::string manifestArg = "/MANIFESTFILE:";
std::vector<cmStdString> rcCommand;
rcCommand.push_back(cmSystemTools::FindProgram("rc.exe"));
std::vector<cmStdString> mtCommand;
@@ -4188,6 +4182,7 @@ int cmake::VisualStudioLinkIncremental(std::vector<std::string>& args,
fout.close();
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
// empty one