kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BUG: Fixed quotes in output paths.

This commit is contained in:
Brad King 2002-12-16 09:39:06 -05:00
parent e0cec1e650
commit 6e10f6cc75
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/cmLocalVisualStudio6Generator.cxx
View File

@ -407,8 +407,8 @@ void cmLocalVisualStudio6Generator::WriteCustomRule(std::ostream& fout,
for(std::set<std::string>::const_iterator output = outputs.begin(); for(std::set<std::string>::const_iterator output = outputs.begin();
output != outputs.end(); ++output) output != outputs.end(); ++output)
{ {
fout << "\"" << cmSystemTools::ConvertToOutputPath(output->c_str()) fout << cmSystemTools::ConvertToOutputPath(output->c_str())
<< "\" : \"$(SOURCE)\" \"$(INTDIR)\" \"$(OUTDIR)\""; << " : \"$(SOURCE)\" \"$(INTDIR)\" \"$(OUTDIR)\"";
fout << command << "\n\n"; fout << command << "\n\n";
} }

6
Source/cmLocalVisualStudio7Generator.cxx
View File

@ -692,9 +692,7 @@ void cmLocalVisualStudio7Generator::WriteVCProjFile(std::ostream& fout,
if (source != libName || target.GetType() == cmTarget::UTILITY) if (source != libName || target.GetType() == cmTarget::UTILITY)
{ {
fout << "\t\t\t<File\n"; fout << "\t\t\t<File\n";
std::string d = this->ConvertToXMLOutputPath(source.c_str()); std::string d = this->ConvertToXMLOutputPathSingle(source.c_str());
// remove double quotes from the string
cmSystemTools::ReplaceString(d, "\"", "");
// Tell MS-Dev what the source is. If the compiler knows how to // Tell MS-Dev what the source is. If the compiler knows how to
// build it, then it will. // build it, then it will.
fout << "\t\t\t\tRelativePath=\"" << d << "\">\n"; fout << "\t\t\t\tRelativePath=\"" << d << "\">\n";
@ -813,7 +811,7 @@ void cmLocalVisualStudio7Generator::WriteCustomRule(std::ostream& fout,
{ {
first = false; first = false;
} }
fout << this->ConvertToXMLOutputPath(output->c_str()); fout << this->ConvertToXMLOutputPathSingle(output->c_str());
} }
fout << "\"/>\n"; fout << "\"/>\n";
fout << "\t\t\t\t</FileConfiguration>\n"; fout << "\t\t\t\t</FileConfiguration>\n";