diff options
| author | Brad King <brad.king@kitware.com> | 2013-10-31 13:40:13 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-10-31 13:40:13 (GMT) |
| commit | 7a616e75b84d692e2df453e889c12d1afdb6c576 (patch) | |
| tree | c99e5be61074ac3b1f5486257b9b113f6fd74b9b /Source/cmVisualStudio10TargetGenerator.cxx | |
| parent | d182a55adb63639d3a4f497c877c9904f3314945 (diff) | |
| parent | 07f5788385de1cc1ba7ada9d3d9adc43382fd5ff (diff) | |
| download | CMake-7a616e75b84d692e2df453e889c12d1afdb6c576.zip CMake-7a616e75b84d692e2df453e889c12d1afdb6c576.tar.gz CMake-7a616e75b84d692e2df453e889c12d1afdb6c576.tar.bz2 | |
Merge topic 'use-generator-target'
07f5788 Move TraceDependencies to cmGeneratorTarget.
fa03777 Do not populate SourceEntries in AddSourceFile.
Diffstat (limited to 'Source/cmVisualStudio10TargetGenerator.cxx')
| -rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index 0dbb5eb..ab97b5e 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -562,7 +562,7 @@ void cmVisualStudio10TargetGenerator::WriteCustomCommand(cmSourceFile* sf) if(this->SourcesVisited.insert(sf).second) { if(std::vector<cmSourceFile*> const* depends = - this->Target->GetSourceDepends(sf)) + this->GeneratorTarget->GetSourceDepends(sf)) { for(std::vector<cmSourceFile*>::const_iterator di = depends->begin(); di != depends->end(); ++di) @@ -1049,7 +1049,8 @@ void cmVisualStudio10TargetGenerator::WriteAllSources() si = this->GeneratorTarget->ExternalObjects.begin(); si != this->GeneratorTarget->ExternalObjects.end(); ++si) { - std::vector<cmSourceFile*> const* d=this->Target->GetSourceDepends(*si); + std::vector<cmSourceFile*> const* d = + this->GeneratorTarget->GetSourceDepends(*si); this->WriteSource((d && !d->empty())? "None":"Object", *si); } } |