commit e1f9d3c0a01fa62eaf933142cb07308eba57acd9
author Brad King <brad.king@kitware.com> Mon Jan 11 09:18:33 2016 -0500
committer Brad King <brad.king@kitware.com> Mon Jan 11 09:18:33 2016 -0500
tree a1c9519e6952f67168808fdafb0b3580f0fb3df9
parent cc5dcb3876851abb7927367d23085d256a0b3e15
parent f086c665da00228cabf465dc1eb7223d40fd6270

Merge branch 'vs14-debug-enum' into release

Source/cmVisualStudio10TargetGenerator.cxx

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 @@
 
     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 += "/";