[Cmake-commits] [cmake-commits] david.cole committed cmLocalVisualStudio7Generator.cxx 1.259 1.260

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv13862

Modified Files:
	cmLocalVisualStudio7Generator.cxx 
Log Message:
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.


Index: cmLocalVisualStudio7Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalVisualStudio7Generator.cxx,v
retrieving revision 1.259
retrieving revision 1.260
diff -C 2 -d -r1.259 -r1.260
*** cmLocalVisualStudio7Generator.cxx	23 Dec 2009 19:17:51 -0000	1.259
--- cmLocalVisualStudio7Generator.cxx	24 Dec 2009 16:40:14 -0000	1.260
***************
*** 745,749 ****
      // non-debug configurations because VS still creates .idb files.
      fout <<  "\t\t\t\tProgramDataBaseFileName=\""
!          << this->ConvertToOptionallyRelativeOutputPath(
                target.GetDirectory(configName).c_str())
           << "/"
--- 745,749 ----
      // non-debug configurations because VS still creates .idb files.
      fout <<  "\t\t\t\tProgramDataBaseFileName=\""
!          << this->ConvertToXMLOutputPathSingle(
                target.GetDirectory(configName).c_str())
           << "/"
***************
*** 1052,1056 ****
      this->OutputLibraryDirectories(fout, cli.GetDirectories());
      fout << "\"\n";
!     std::string path = this->ConvertToOptionallyRelativeOutputPath(
        target.GetDirectory(configName).c_str());
      fout << "\t\t\t\tProgramDataBaseFile=\""
--- 1052,1056 ----
      this->OutputLibraryDirectories(fout, cli.GetDirectories());
      fout << "\"\n";
!     std::string path = this->ConvertToXMLOutputPathSingle(
        target.GetDirectory(configName).c_str());
      fout << "\t\t\t\tProgramDataBaseFile=\""