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

Merge topic 'vs14-debug-enum' 

f086c665 VS: Fix VS 2015 .vcxproj file value for GenerateDebugInformation (#15894)
This commit is contained in:
Brad King 2016-01-11 09:17:41 -05:00 committed by CMake Topic Stage
parent d9f9c4fbc0 f086c665da
commit cedbb7994d
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Source/cmVisualStudio10TargetGenerator.cxx
View File

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