From 8952f49803c61268a461c8416b15e7137dbf3f2b Mon Sep 17 00:00:00 2001 From: David Cole Date: Thu, 24 Dec 2009 11:40:14 -0500 Subject: [PATCH] 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. --- Source/cmLocalVisualStudio7Generator.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx index f205da87f..1af0d1d42 100644 --- a/Source/cmLocalVisualStudio7Generator.cxx +++ b/Source/cmLocalVisualStudio7Generator.cxx @@ -744,7 +744,7 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout, // We need to specify a program database file name even for // non-debug configurations because VS still creates .idb files. fout << "\t\t\t\tProgramDataBaseFileName=\"" - << this->ConvertToOptionallyRelativeOutputPath( + << this->ConvertToXMLOutputPathSingle( target.GetDirectory(configName).c_str()) << "/" << target.GetPDBName(configName) << "\"\n"; @@ -1051,7 +1051,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout, fout << "\t\t\t\tAdditionalLibraryDirectories=\""; this->OutputLibraryDirectories(fout, cli.GetDirectories()); fout << "\"\n"; - std::string path = this->ConvertToOptionallyRelativeOutputPath( + std::string path = this->ConvertToXMLOutputPathSingle( target.GetDirectory(configName).c_str()); fout << "\t\t\t\tProgramDataBaseFile=\"" << path << "/" << targetNamePDB