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

[cmake-commits at cmake.org]

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

Modified Files:
	cmLocalVisualStudio7Generator.cxx 
Log Message:
Fix issue #9042 - use relative path for pdb file name when CMAKE_USE_RELATIVE_PATHS is on.


Index: cmLocalVisualStudio7Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalVisualStudio7Generator.cxx,v
retrieving revision 1.258
retrieving revision 1.259
diff -C 2 -d -r1.258 -r1.259
*** cmLocalVisualStudio7Generator.cxx	2 Dec 2009 16:49:52 -0000	1.258
--- cmLocalVisualStudio7Generator.cxx	23 Dec 2009 19:17:51 -0000	1.259
***************
*** 745,749 ****
      // non-debug configurations because VS still creates .idb files.
      fout <<  "\t\t\t\tProgramDataBaseFileName=\""
!          << target.GetDirectory(configName) << "/"
           << target.GetPDBName(configName) << "\"\n";
      }
--- 745,751 ----
      // non-debug configurations because VS still creates .idb files.
      fout <<  "\t\t\t\tProgramDataBaseFileName=\""
!          << this->ConvertToOptionallyRelativeOutputPath(
!               target.GetDirectory(configName).c_str())
!          << "/"
           << target.GetPDBName(configName) << "\"\n";
      }
***************
*** 1050,1055 ****
      this->OutputLibraryDirectories(fout, cli.GetDirectories());
      fout << "\"\n";
      fout << "\t\t\t\tProgramDataBaseFile=\""
!          << target.GetDirectory(configName) << "/" << targetNamePDB
           << "\"\n";
      if(isDebug)
--- 1052,1059 ----
      this->OutputLibraryDirectories(fout, cli.GetDirectories());
      fout << "\"\n";
+     std::string path = this->ConvertToOptionallyRelativeOutputPath(
+       target.GetDirectory(configName).c_str());
      fout << "\t\t\t\tProgramDataBaseFile=\""
!          << path << "/" << targetNamePDB
           << "\"\n";
      if(isDebug)