summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2002-12-16 14:39:06 (GMT)
committerBrad King <brad.king@kitware.com>2002-12-16 14:39:06 (GMT)
commit6e10f6cc7561a5a7e0f5f4f556aed0e7aa3be6d4 (patch)
treeb8c64ebc013cc57d48c0fce336e9f9c23c2f458a
parente0cec1e650138f797467967e8a4c8ae66dc61e37 (diff)
downloadCMake-6e10f6cc7561a5a7e0f5f4f556aed0e7aa3be6d4.zip
CMake-6e10f6cc7561a5a7e0f5f4f556aed0e7aa3be6d4.tar.gz
CMake-6e10f6cc7561a5a7e0f5f4f556aed0e7aa3be6d4.tar.bz2
BUG: Fixed quotes in output paths.
-rw-r--r--Source/cmLocalVisualStudio6Generator.cxx4
-rw-r--r--Source/cmLocalVisualStudio7Generator.cxx6
2 files changed, 4 insertions, 6 deletions
diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index 64d9c83..499118f 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -407,8 +407,8 @@ void cmLocalVisualStudio6Generator::WriteCustomRule(std::ostream& fout,
for(std::set<std::string>::const_iterator output = outputs.begin();
output != outputs.end(); ++output)
{
- fout << "\"" << cmSystemTools::ConvertToOutputPath(output->c_str())
- << "\" : \"$(SOURCE)\" \"$(INTDIR)\" \"$(OUTDIR)\"";
+ fout << cmSystemTools::ConvertToOutputPath(output->c_str())
+ << " : \"$(SOURCE)\" \"$(INTDIR)\" \"$(OUTDIR)\"";
fout << command << "\n\n";
}
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 963199b..325ea9b 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -692,9 +692,7 @@ void cmLocalVisualStudio7Generator::WriteVCProjFile(std::ostream& fout,
if (source != libName || target.GetType() == cmTarget::UTILITY)
{
fout << "\t\t\t<File\n";
- std::string d = this->ConvertToXMLOutputPath(source.c_str());
- // remove double quotes from the string
- cmSystemTools::ReplaceString(d, "\"", "");
+ std::string d = this->ConvertToXMLOutputPathSingle(source.c_str());
// Tell MS-Dev what the source is. If the compiler knows how to
// build it, then it will.
fout << "\t\t\t\tRelativePath=\"" << d << "\">\n";
@@ -813,7 +811,7 @@ void cmLocalVisualStudio7Generator::WriteCustomRule(std::ostream& fout,
{
first = false;
}
- fout << this->ConvertToXMLOutputPath(output->c_str());
+ fout << this->ConvertToXMLOutputPathSingle(output->c_str());
}
fout << "\"/>\n";
fout << "\t\t\t\t</FileConfiguration>\n";