Merge branch 'vs14-debug-enum-older-toolsets' into release
This commit is contained in:
commit
054275c6d6
|
@ -44,6 +44,8 @@
|
||||||
|
|
||||||
#include <cmsys/auto_ptr.hxx>
|
#include <cmsys/auto_ptr.hxx>
|
||||||
|
|
||||||
|
static std::string const kWINDOWS_7_1_SDK = "Windows7.1SDK";
|
||||||
|
|
||||||
cmIDEFlagTable const* cmVisualStudio10TargetGenerator::GetClFlagTable() const
|
cmIDEFlagTable const* cmVisualStudio10TargetGenerator::GetClFlagTable() const
|
||||||
{
|
{
|
||||||
if (this->MSTools) {
|
if (this->MSTools) {
|
||||||
|
@ -2354,10 +2356,11 @@ bool cmVisualStudio10TargetGenerator::ComputeLinkOptions(
|
||||||
cmGlobalVisualStudio10Generator* gg =
|
cmGlobalVisualStudio10Generator* gg =
|
||||||
static_cast<cmGlobalVisualStudio10Generator*>(this->GlobalGenerator);
|
static_cast<cmGlobalVisualStudio10Generator*>(this->GlobalGenerator);
|
||||||
const char* toolset = gg->GetPlatformToolset();
|
const char* toolset = gg->GetPlatformToolset();
|
||||||
if (toolset && (cmHasLiteralPrefix(toolset, "v90") ||
|
if (toolset &&
|
||||||
cmHasLiteralPrefix(toolset, "v100") ||
|
(toolset == kWINDOWS_7_1_SDK || cmHasLiteralPrefix(toolset, "v90") ||
|
||||||
cmHasLiteralPrefix(toolset, "v110") ||
|
cmHasLiteralPrefix(toolset, "v100") ||
|
||||||
cmHasLiteralPrefix(toolset, "v120"))) {
|
cmHasLiteralPrefix(toolset, "v110") ||
|
||||||
|
cmHasLiteralPrefix(toolset, "v120"))) {
|
||||||
if (const char* debug =
|
if (const char* debug =
|
||||||
linkOptions.GetFlag("GenerateDebugInformation")) {
|
linkOptions.GetFlag("GenerateDebugInformation")) {
|
||||||
// Convert value from enumeration back to boolean for older toolsets.
|
// Convert value from enumeration back to boolean for older toolsets.
|
||||||
|
|
Loading…
Reference in New Issue