summaryrefslogtreecommitdiffstats
path: root/Source/cmVisualStudio10TargetGenerator.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-01-11 14:17:41 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2016-01-11 14:17:41 (GMT)
commitcedbb7994dddce2c3fdf846bf4563c846adf4632 (patch)
treeca92404970c6be8c8ff51aed14cba1f535dd37d3 /Source/cmVisualStudio10TargetGenerator.cxx
parentd9f9c4fbc0a02f048793f4b91aeb5c65d9571e84 (diff)
parentf086c665da00228cabf465dc1eb7223d40fd6270 (diff)
downloadCMake-cedbb7994dddce2c3fdf846bf4563c846adf4632.zip
CMake-cedbb7994dddce2c3fdf846bf4563c846adf4632.tar.gz
CMake-cedbb7994dddce2c3fdf846bf4563c846adf4632.tar.bz2
Merge topic 'vs14-debug-enum'
f086c665 VS: Fix VS 2015 .vcxproj file value for GenerateDebugInformation (#15894)
Diffstat (limited to 'Source/cmVisualStudio10TargetGenerator.cxx')
-rw-r--r--Source/cmVisualStudio10TargetGenerator.cxx20
1 files changed, 18 insertions, 2 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 6e1fb5b..669c785 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -2599,11 +2599,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->GeneratorTarget->GetPDBDirectory(config.c_str());
pdb += "/";