kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ENH: fix for bug where debug, release etc flags were not used for linker options, BUG 1781 fix

Browse Source
This commit is contained in:
Bill Hoffman 2005-05-12 13:27:48 -04:00
parent 32aef87e3b
commit 70ed04df05
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Source/cmLocalVisualStudio7Generator.cxx
View File

@ -573,9 +573,9 @@ void cmLocalVisualStudio7Generator::FillFlagMapFromCommandFlags(
void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
const char* configName,
const char *libName,
const cmTarget &target)
const char* configName,
const char *libName,
const cmTarget &target)
{
std::string temp;
std::string debugPostfix = "";
@ -586,17 +586,27 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
}
std::string extraLinkOptions;
std::string flagVar;
if(target.GetType() == cmTarget::EXECUTABLE)
{
extraLinkOptions = m_Makefile->GetRequiredDefinition("CMAKE_EXE_LINKER_FLAGS");
flagVar = "CMAKE_EXE_LINKER_FLAGS";
}
if(target.GetType() == cmTarget::SHARED_LIBRARY)
{
extraLinkOptions = m_Makefile->GetRequiredDefinition("CMAKE_SHARED_LINKER_FLAGS");
flagVar = "CMAKE_SHARED_LINKER_FLAGS";
}
if(target.GetType() == cmTarget::MODULE_LIBRARY)
{
extraLinkOptions = m_Makefile->GetRequiredDefinition("CMAKE_MODULE_LINKER_FLAGS");
flagVar = "CMAKE_MODULE_LINKER_FLAGS";
}
extraLinkOptions = m_Makefile->GetRequiredDefinition(flagVar.c_str());
// Now add _DEBUG, _RELEASE, etc version of flagVar
if(configName)
{
flagVar += "_";
flagVar += cmSystemTools::UpperCase(std::string(configName));
extraLinkOptions += " ";
extraLinkOptions += m_Makefile->GetRequiredDefinition(flagVar.c_str());
}
const char* targetLinkFlags = target.GetProperty("LINK_FLAGS");