diff options
| author | Brad King <brad.king@kitware.com> | 2016-01-11 14:18:33 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-01-11 14:18:33 (GMT) |
| commit | e1f9d3c0a01fa62eaf933142cb07308eba57acd9 (patch) | |
| tree | a1c9519e6952f67168808fdafb0b3580f0fb3df9 /Source | |
| parent | cc5dcb3876851abb7927367d23085d256a0b3e15 (diff) | |
| parent | f086c665da00228cabf465dc1eb7223d40fd6270 (diff) | |
| download | CMake-e1f9d3c0a01fa62eaf933142cb07308eba57acd9.zip CMake-e1f9d3c0a01fa62eaf933142cb07308eba57acd9.tar.gz CMake-e1f9d3c0a01fa62eaf933142cb07308eba57acd9.tar.bz2 | |
Merge branch 'vs14-debug-enum' into release
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 20 |
1 files 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 += "/"; |