Merge branch 'vs-NsightTegra-empty-version' into release

This commit is contained in:
Brad King 2016-08-26 10:03:31 -04:00
commit c8c58947f2
1 changed files with 4 additions and 5 deletions

View File

@ -185,13 +185,12 @@ cmVisualStudio10TargetGenerator::cmVisualStudio10TargetGenerator(
this->GUID = this->GlobalGenerator->GetGUID(this->Name.c_str()); this->GUID = this->GlobalGenerator->GetGUID(this->Name.c_str());
this->Platform = gg->GetPlatformName(); this->Platform = gg->GetPlatformName();
this->NsightTegra = gg->IsNsightTegra(); this->NsightTegra = gg->IsNsightTegra();
for (int i = for (int i = 0; i < 4; ++i) {
sscanf(gg->GetNsightTegraVersion().c_str(), "%u.%u.%u.%u",
&this->NsightTegraVersion[0], &this->NsightTegraVersion[1],
&this->NsightTegraVersion[2], &this->NsightTegraVersion[3]);
i < 4; ++i) {
this->NsightTegraVersion[i] = 0; this->NsightTegraVersion[i] = 0;
} }
sscanf(gg->GetNsightTegraVersion().c_str(), "%u.%u.%u.%u",
&this->NsightTegraVersion[0], &this->NsightTegraVersion[1],
&this->NsightTegraVersion[2], &this->NsightTegraVersion[3]);
this->MSTools = !this->NsightTegra; this->MSTools = !this->NsightTegra;
this->TargetCompileAsWinRT = false; this->TargetCompileAsWinRT = false;
this->BuildFileStream = 0; this->BuildFileStream = 0;