diff options
| author | David Cole <david.cole@kitware.com> | 2009-12-24 16:40:14 (GMT) |
|---|---|---|
| committer | David Cole <david.cole@kitware.com> | 2009-12-24 16:40:14 (GMT) |
| commit | 8952f49803c61268a461c8416b15e7137dbf3f2b (patch) | |
| tree | ac1da165689201e5fe0e67e9ce616b253c423c1b /Source/cmLocalVisualStudio7Generator.cxx | |
| parent | 5da839a759eae10844a75a8a3cf7f4544302e762 (diff) | |
| download | CMake-8952f49803c61268a461c8416b15e7137dbf3f2b.zip CMake-8952f49803c61268a461c8416b15e7137dbf3f2b.tar.gz CMake-8952f49803c61268a461c8416b15e7137dbf3f2b.tar.bz2 | |
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.
Diffstat (limited to 'Source/cmLocalVisualStudio7Generator.cxx')
| -rw-r--r-- | Source/cmLocalVisualStudio7Generator.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx index f205da8..1af0d1d 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 |