summaryrefslogtreecommitdiffstats
path: root/Source/cmLocalVisualStudio7Generator.cxx
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2015-10-09 20:27:46 (GMT)
committerStephen Kelly <steveire@gmail.com>2015-10-14 22:33:12 (GMT)
commit7f5ec9f109dc66bc22ac377a7fb57d9221aed56b (patch)
tree0adc08136e41c577aa436b4ce056a39fd5540fdb /Source/cmLocalVisualStudio7Generator.cxx
parent06f56d3bf5d8210d190e1bfcf05673ceb78c5594 (diff)
downloadCMake-7f5ec9f109dc66bc22ac377a7fb57d9221aed56b.zip
CMake-7f5ec9f109dc66bc22ac377a7fb57d9221aed56b.tar.gz
CMake-7f5ec9f109dc66bc22ac377a7fb57d9221aed56b.tar.bz2
cmLocalGenerator: Port GetTargetDirectory to cmGeneratorTarget.
Diffstat (limited to 'Source/cmLocalVisualStudio7Generator.cxx')
-rw-r--r--Source/cmLocalVisualStudio7Generator.cxx12
1 files changed, 7 insertions, 5 deletions
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 82b18c6..65f42c2 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -784,7 +784,7 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
// The intermediate directory name consists of a directory for the
// target and a subdirectory for the configuration name.
- std::string intermediateDir = this->GetTargetDirectory(target);
+ std::string intermediateDir = this->GetTargetDirectory(gt);
intermediateDir += "/";
intermediateDir += configName;
@@ -1113,7 +1113,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
break;
case cmTarget::OBJECT_LIBRARY:
{
- std::string libpath = this->GetTargetDirectory(target);
+ std::string libpath = this->GetTargetDirectory(gt);
libpath += "/";
libpath += configName;
libpath += "/";
@@ -1725,7 +1725,9 @@ cmLocalVisualStudio7Generator
std::string dir_max;
dir_max += this->GetCurrentBinaryDirectory();
dir_max += "/";
- dir_max += this->GetTargetDirectory(target);
+ cmGeneratorTarget* gt =
+ this->GlobalGenerator->GetGeneratorTarget(&target);
+ dir_max += this->GetTargetDirectory(gt);
dir_max += "/";
dir_max += config_max;
dir_max += "/";
@@ -2369,10 +2371,10 @@ void cmLocalVisualStudio7Generator::ReadAndStoreExternalGUID(
//----------------------------------------------------------------------------
std::string cmLocalVisualStudio7Generator
-::GetTargetDirectory(cmTarget const& target) const
+::GetTargetDirectory(cmGeneratorTarget const* target) const
{
std::string dir;
- dir += target.GetName();
+ dir += target->GetName();
dir += ".dir";
return dir;
}