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

Merge branch 'vs14-debug-enum' into release

This commit is contained in:
Brad King 2016-01-11 09:18:33 -05:00
parent cc5dcb3876 f086c665da
commit e1f9d3c0a0
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Source/cmVisualStudio10TargetGenerator.cxx
View File

@ -2578,13 +2578,29 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
} }
if(linkOptions.IsDebug() || flags.find("/debug") != flags.npos) if(linkOptions.IsDebug() || flags.find("/debug") != flags.npos)
{
if (this->LocalGenerator->GetVersion() >=
cmGlobalVisualStudioGenerator::VS14)
{
linkOptions.AddFlag("GenerateDebugInformation", "Debug");
}
else
{ {
linkOptions.AddFlag("GenerateDebugInformation", "true"); linkOptions.AddFlag("GenerateDebugInformation", "true");
} }
}
else
{
if (this->LocalGenerator->GetVersion() >=
cmGlobalVisualStudioGenerator::VS14)
{
linkOptions.AddFlag("GenerateDebugInformation", "No");
}
else else
{ {
linkOptions.AddFlag("GenerateDebugInformation", "false"); linkOptions.AddFlag("GenerateDebugInformation", "false");
} }
}
std::string pdb = this->Target->GetPDBDirectory(config.c_str()); std::string pdb = this->Target->GetPDBDirectory(config.c_str());
pdb += "/"; pdb += "/";
pdb += targetNamePDB; pdb += targetNamePDB;