diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2009-09-01 18:33:26 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2009-09-01 18:33:26 (GMT) |
| commit | e9a170b1086ca61a71993da9dcfb0c09f7b8cfdc (patch) | |
| tree | 3001b22abbc83ce6a8ca01731c87c63ccc6f3ac2 /Source/cmake.cxx | |
| parent | 5fa4784274171ed615c922811cd0a7723bee0465 (diff) | |
| download | CMake-e9a170b1086ca61a71993da9dcfb0c09f7b8cfdc.zip CMake-e9a170b1086ca61a71993da9dcfb0c09f7b8cfdc.tar.gz CMake-e9a170b1086ca61a71993da9dcfb0c09f7b8cfdc.tar.bz2 | |
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
Diffstat (limited to 'Source/cmake.cxx')
| -rw-r--r-- | Source/cmake.cxx | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/Source/cmake.cxx b/Source/cmake.cxx index d6bbcc1..772b8a3 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -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 |