diff options
author | Stephen Kelly <steveire@gmail.com> | 2015-10-23 16:26:44 (GMT) |
---|---|---|
committer | Stephen Kelly <steveire@gmail.com> | 2015-10-24 07:24:30 (GMT) |
commit | b13e26e278dcc34243a2b31dfca8e23b01e15b76 (patch) | |
tree | f26ee6c4d51f8d42dbefaebbf6031f481b54bba5 /Source/cmGlobalVisualStudio7Generator.cxx | |
parent | 8ac8739b2e5df2f36194261f9dcac95107b4b5f7 (diff) | |
download | CMake-b13e26e278dcc34243a2b31dfca8e23b01e15b76.zip CMake-b13e26e278dcc34243a2b31dfca8e23b01e15b76.tar.gz CMake-b13e26e278dcc34243a2b31dfca8e23b01e15b76.tar.bz2 |
VS: Port ProjectDepends to cmGeneratorTarget.
Diffstat (limited to 'Source/cmGlobalVisualStudio7Generator.cxx')
-rw-r--r-- | Source/cmGlobalVisualStudio7Generator.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx index 906166c..972188f 100644 --- a/Source/cmGlobalVisualStudio7Generator.cxx +++ b/Source/cmGlobalVisualStudio7Generator.cxx @@ -533,19 +533,19 @@ void cmGlobalVisualStudio7Generator::WriteTargetDepends( for(OrderedTargetDependSet::const_iterator tt = projectTargets.begin(); tt != projectTargets.end(); ++tt) { - cmTarget const* target = (*tt)->Target; + cmGeneratorTarget const* target = *tt; if(target->GetType() == cmState::INTERFACE_LIBRARY) { continue; } - cmMakefile* mf = target->GetMakefile(); const char *vcprojName = target->GetProperty("GENERATOR_FILE_NAME"); if (vcprojName) { - std::string dir = mf->GetCurrentSourceDirectory(); + std::string dir = target->GetLocalGenerator() + ->GetCurrentSourceDirectory(); this->WriteProjectDepends(fout, vcprojName, - dir.c_str(), *target); + dir.c_str(), target); } } } @@ -726,11 +726,11 @@ void cmGlobalVisualStudio7Generator ::WriteProjectDepends(std::ostream& fout, const std::string& dspname, - const char*, cmTarget const& target) + const char*, cmGeneratorTarget const* target) { int depcount = 0; std::string dspguid = this->GetGUID(dspname); - VSDependSet const& depends = this->VSTargetDepends[&target]; + VSDependSet const& depends = this->VSTargetDepends[target->Target]; for(VSDependSet::const_iterator di = depends.begin(); di != depends.end(); ++di) { @@ -739,7 +739,7 @@ cmGlobalVisualStudio7Generator if(guid.empty()) { std::string m = "Target: "; - m += target.GetName(); + m += target->GetName(); m += " depends on unknown target: "; m += name; cmSystemTools::Error(m.c_str()); @@ -748,7 +748,7 @@ cmGlobalVisualStudio7Generator depcount++; } - UtilityDependsMap::iterator ui = this->UtilityDepends.find(&target); + UtilityDependsMap::iterator ui = this->UtilityDepends.find(target->Target); if(ui != this->UtilityDepends.end()) { const char* uname = ui->second.c_str(); |