diff options
| author | Brad King <brad.king@kitware.com> | 2007-03-08 20:33:19 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2007-03-08 20:33:19 (GMT) |
| commit | 01dc699d82af9bca7d9f4c1bdc9e453e764861ba (patch) | |
| tree | 5a74141a229e9737198b5e774ebb0c3f45942c2d /Source/cmLocalVisualStudio7Generator.cxx | |
| parent | 789a0f83594cd3bafcc9a3051a5ed53ec76c8684 (diff) | |
| download | CMake-01dc699d82af9bca7d9f4c1bdc9e453e764861ba.zip CMake-01dc699d82af9bca7d9f4c1bdc9e453e764861ba.tar.gz CMake-01dc699d82af9bca7d9f4c1bdc9e453e764861ba.tar.bz2 | |
ENH: Combined cmTarget::GetDirectory and cmTarget::GetOutputDir since they are nearly the same. This is another step for bug#2240.
Diffstat (limited to 'Source/cmLocalVisualStudio7Generator.cxx')
| -rw-r--r-- | Source/cmLocalVisualStudio7Generator.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx index bd13095..218acc8 100644 --- a/Source/cmLocalVisualStudio7Generator.cxx +++ b/Source/cmLocalVisualStudio7Generator.cxx @@ -605,7 +605,7 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout, target.GetType() == cmTarget::MODULE_LIBRARY)) { fout << "\t\t\t\tProgramDataBaseFileName=\"" - << target.GetOutputDir() << "/$(OutDir)/" + << target.GetDirectory() << "/$(OutDir)/" << target.GetPDBName(configName) << "\"\n"; } fout << "/>\n"; // end of <Tool Name=VCCLCompilerTool @@ -728,7 +728,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout, case cmTarget::STATIC_LIBRARY: { std::string targetNameFull = target.GetFullName(configName); - std::string libpath = target.GetOutputDir(); + std::string libpath = target.GetDirectory(); libpath += "/$(OutDir)/"; libpath += targetNameFull; fout << "\t\t\t<Tool\n" @@ -795,7 +795,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout, << " "; this->OutputLibraries(fout, linkLibs); fout << "\"\n"; - temp = target.GetOutputDir(); + temp = target.GetDirectory(); temp += "/"; temp += configName; temp += "/"; @@ -808,7 +808,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout, this->OutputLibraryDirectories(fout, linkDirs); fout << "\"\n"; this->OutputModuleDefinitionFile(fout, target); - temp = target.GetOutputDir(); + temp = target.GetDirectory(); temp += "/$(OutDir)/"; temp += targetNamePDB; fout << "\t\t\t\tProgramDataBaseFile=\"" << @@ -826,7 +826,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout, { fout << "\t\t\t\tStackReserveSize=\"" << stackVal << "\"\n"; } - temp = target.GetOutputDir(); + temp = target.GetDirectory(); temp += "/"; temp += configName; temp += "/"; @@ -875,7 +875,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout, << " "; this->OutputLibraries(fout, linkLibs); fout << "\"\n"; - temp = target.GetOutputDir(); + temp = target.GetDirectory(); temp += "/"; temp += configName; temp += "/"; @@ -888,7 +888,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout, this->OutputLibraryDirectories(fout, linkDirs); fout << "\"\n"; fout << "\t\t\t\tProgramDataBaseFile=\"" - << target.GetOutputDir() << "\\$(OutDir)\\" << targetNamePDB + << target.GetDirectory() << "\\$(OutDir)\\" << targetNamePDB << "\"\n"; if(strcmp(configName, "Debug") == 0 || strcmp(configName, "RelWithDebInfo") == 0) |