BUG: fix for 7839 and 4524

This commit is contained in:
Bill Hoffman 2008-10-27 13:51:30 -04:00
parent fce34113e0
commit 1ed93e0a0e
1 changed files with 2 additions and 7 deletions

View File

@ -1843,14 +1843,9 @@ cmLocalVisualStudio7Generator::WriteProjectStart(std::ostream& fout,
vsLocalpath = ""; vsLocalpath = "";
} }
const char* vsProvider = target.GetProperty("VS_SCC_PROVIDER"); const char* vsProvider = target.GetProperty("VS_SCC_PROVIDER");
std::string providerString;
if (!vsProvider) if (!vsProvider)
{ {
providerString = ""; vsProvider = "";
}
else
{
providerString = "\tSccProvider=\"" + std::string(vsProvider) + "\"\n";
} }
cmGlobalVisualStudio7Generator* gg = cmGlobalVisualStudio7Generator* gg =
static_cast<cmGlobalVisualStudio7Generator *>(this->GlobalGenerator); static_cast<cmGlobalVisualStudio7Generator *>(this->GlobalGenerator);
@ -1865,7 +1860,7 @@ cmLocalVisualStudio7Generator::WriteProjectStart(std::ostream& fout,
{ {
fout << "\tSccProjectName=\"" << vsProjectname << "\"\n" fout << "\tSccProjectName=\"" << vsProjectname << "\"\n"
<< "\tSccLocalPath=\"" << vsLocalpath << "\"\n" << "\tSccLocalPath=\"" << vsLocalpath << "\"\n"
<< "\tSccProvider=\"" << providerString << "\"\n"; << "\tSccProvider=\"" << vsProvider << "\"\n";
} }
fout << "\tKeyword=\"" << keyword << "\">\n" fout << "\tKeyword=\"" << keyword << "\">\n"
<< "\t<Platforms>\n" << "\t<Platforms>\n"