kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests 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

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Modules/Platform/Windows-cl.cmake
View File

@ -199,7 +199,7 @@ IF(MSVC_VERSION GREATER 1310)
SET (CMAKE_C_FLAGS_RELEASE_INIT "/MD /O2 /Ob2 /D NDEBUG")
SET (CMAKE_C_FLAGS_RELWITHDEBINFO_INIT "/MD /Zi /O2 /Ob1 /D NDEBUG")
SET (CMAKE_C_STANDARD_LIBRARIES_INIT "kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib ")
SET (CMAKE_EXE_LINKER_FLAGS_INIT "${CMAKE_EXE_LINKER_FLAGS_INIT} /MANIFEST")
SET (CMAKE_EXE_LINKER_FLAGS_INIT "${CMAKE_EXE_LINKER_FLAGS_INIT}")
ELSE(MSVC_VERSION GREATER 1310)
IF(CMAKE_USING_VC_FREE_TOOLS)
MESSAGE(STATUS "Using FREE VC TOOLS, NO DEBUG available")

9
Source/cmake.cxx
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