summaryrefslogtreecommitdiffstats
path: root/Source/cmLocalVisualStudio7Generator.cxx
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2008-10-27 17:51:30 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2008-10-27 17:51:30 (GMT)
commit1ed93e0a0ed5625f8edd68d57dbec0ab193b0d31 (patch)
tree69fd16caaf2337105e78e656ae99319cab124acb /Source/cmLocalVisualStudio7Generator.cxx
parentfce34113e071f527f1dd1d795b6f8c187bb1f03a (diff)
downloadCMake-1ed93e0a0ed5625f8edd68d57dbec0ab193b0d31.zip
CMake-1ed93e0a0ed5625f8edd68d57dbec0ab193b0d31.tar.gz
CMake-1ed93e0a0ed5625f8edd68d57dbec0ab193b0d31.tar.bz2
BUG: fix for 7839 and 4524
Diffstat (limited to 'Source/cmLocalVisualStudio7Generator.cxx')
-rw-r--r--Source/cmLocalVisualStudio7Generator.cxx9
1 files changed, 2 insertions, 7 deletions
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index ce603b6..186b0fe 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -1843,14 +1843,9 @@ cmLocalVisualStudio7Generator::WriteProjectStart(std::ostream& fout,
vsLocalpath = "";
}
const char* vsProvider = target.GetProperty("VS_SCC_PROVIDER");
- std::string providerString;
if (!vsProvider)
{
- providerString = "";
- }
- else
- {
- providerString = "\tSccProvider=\"" + std::string(vsProvider) + "\"\n";
+ vsProvider = "";
}
cmGlobalVisualStudio7Generator* gg =
static_cast<cmGlobalVisualStudio7Generator *>(this->GlobalGenerator);
@@ -1865,7 +1860,7 @@ cmLocalVisualStudio7Generator::WriteProjectStart(std::ostream& fout,
{
fout << "\tSccProjectName=\"" << vsProjectname << "\"\n"
<< "\tSccLocalPath=\"" << vsLocalpath << "\"\n"
- << "\tSccProvider=\"" << providerString << "\"\n";
+ << "\tSccProvider=\"" << vsProvider << "\"\n";
}
fout << "\tKeyword=\"" << keyword << "\">\n"
<< "\t<Platforms>\n"