From f086c665da00228cabf465dc1eb7223d40fd6270 Mon Sep 17 00:00:00 2001 From: Brad King Date: Fri, 8 Jan 2016 14:12:48 -0500 Subject: VS: Fix VS 2015 .vcxproj file value for GenerateDebugInformation (#15894) Starting with VS 2015 the GenerateDebugInformation build property is an enumeration (`No`, `Debug`, `DebugFastLink`) instead of a boolean value (`false`, `true`). For now we simply change to `No` and `Debug` fix current behavior. Support for `/debug:fastlink` can be added later. --- Source/cmVisualStudio10TargetGenerator.cxx | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index 1de2847..6b46773 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -2579,11 +2579,27 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config) 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 { - linkOptions.AddFlag("GenerateDebugInformation", "false"); + if (this->LocalGenerator->GetVersion() >= + cmGlobalVisualStudioGenerator::VS14) + { + linkOptions.AddFlag("GenerateDebugInformation", "No"); + } + else + { + linkOptions.AddFlag("GenerateDebugInformation", "false"); + } } std::string pdb = this->Target->GetPDBDirectory(config.c_str()); pdb += "/"; -- cgit v0.12