diff options
| author | David Cole <david.cole@kitware.com> | 2009-12-23 19:17:51 (GMT) |
|---|---|---|
| committer | David Cole <david.cole@kitware.com> | 2009-12-23 19:17:51 (GMT) |
| commit | 68ed752b7db18013641683c139c3aa0671f2d757 (patch) | |
| tree | 9e7384d5bb09079c6d951b292856d8247aa046b1 /Source/cmLocalVisualStudio7Generator.cxx | |
| parent | c1beb3b141e470e95d46ba58f22f005544d984dc (diff) | |
| download | CMake-68ed752b7db18013641683c139c3aa0671f2d757.zip CMake-68ed752b7db18013641683c139c3aa0671f2d757.tar.gz CMake-68ed752b7db18013641683c139c3aa0671f2d757.tar.bz2 | |
Fix issue #9042 - use relative path for pdb file name when CMAKE_USE_RELATIVE_PATHS is on.
Diffstat (limited to 'Source/cmLocalVisualStudio7Generator.cxx')
| -rw-r--r-- | Source/cmLocalVisualStudio7Generator.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx index c9b9722..f205da8 100644 --- a/Source/cmLocalVisualStudio7Generator.cxx +++ b/Source/cmLocalVisualStudio7Generator.cxx @@ -744,7 +744,9 @@ 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=\"" - << target.GetDirectory(configName) << "/" + << this->ConvertToOptionallyRelativeOutputPath( + target.GetDirectory(configName).c_str()) + << "/" << target.GetPDBName(configName) << "\"\n"; } fout << "/>\n"; // end of <Tool Name=VCCLCompilerTool @@ -1049,8 +1051,10 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout, fout << "\t\t\t\tAdditionalLibraryDirectories=\""; this->OutputLibraryDirectories(fout, cli.GetDirectories()); fout << "\"\n"; + std::string path = this->ConvertToOptionallyRelativeOutputPath( + target.GetDirectory(configName).c_str()); fout << "\t\t\t\tProgramDataBaseFile=\"" - << target.GetDirectory(configName) << "/" << targetNamePDB + << path << "/" << targetNamePDB << "\"\n"; if(isDebug) { |