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

Fix issue #9042 - correctly this time. Fix failing tests on VS 7, 8 and 9 dashboards. Use ConvertToXMLOutputPathSingle instead of ConvertToOptionallyRelativeOutputPath to handle spaces in the path and double quoting properly. Related to commit trying to fix issue #9042 from yesterday.

This commit is contained in:
David Cole 2009-12-24 11:40:14 -05:00
parent 5da839a759
commit 8952f49803
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/cmLocalVisualStudio7Generator.cxx
View File

@ -744,7 +744,7 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
// We need to specify a program database file name even for // We need to specify a program database file name even for
// non-debug configurations because VS still creates .idb files. // non-debug configurations because VS still creates .idb files.
fout << "\t\t\t\tProgramDataBaseFileName=\"" fout << "\t\t\t\tProgramDataBaseFileName=\""
<< this->ConvertToOptionallyRelativeOutputPath( << this->ConvertToXMLOutputPathSingle(
target.GetDirectory(configName).c_str()) target.GetDirectory(configName).c_str())
<< "/" << "/"
<< target.GetPDBName(configName) << "\"\n"; << target.GetPDBName(configName) << "\"\n";
@ -1051,7 +1051,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
fout << "\t\t\t\tAdditionalLibraryDirectories=\""; fout << "\t\t\t\tAdditionalLibraryDirectories=\"";
this->OutputLibraryDirectories(fout, cli.GetDirectories()); this->OutputLibraryDirectories(fout, cli.GetDirectories());
fout << "\"\n"; fout << "\"\n";
std::string path = this->ConvertToOptionallyRelativeOutputPath( std::string path = this->ConvertToXMLOutputPathSingle(
target.GetDirectory(configName).c_str()); target.GetDirectory(configName).c_str());
fout << "\t\t\t\tProgramDataBaseFile=\"" fout << "\t\t\t\tProgramDataBaseFile=\""
<< path << "/" << targetNamePDB << path << "/" << targetNamePDB