Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- Source/cmVisualStudio10TargetGenerator.cxx | 16 ++++++++++++----
- 1 file changed, 12 insertions(+), 4 deletions(-)
- diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
- index 1e37ca5..c880ff9 100644
- --- a/Source/cmVisualStudio10TargetGenerator.cxx
- +++ b/Source/cmVisualStudio10TargetGenerator.cxx
- @@ -871,10 +871,18 @@ void cmVisualStudio10TargetGenerator::WriteAllSources()
- si = this->GeneratorTarget->ExternalObjects.begin();
- si != this->GeneratorTarget->ExternalObjects.end(); ++si)
- {
- - // If an object file is generated in this target, then vs10 will use
- - // it in the build, and we have to list it as None instead of Object.
- - std::vector<cmSourceFile*> const* d = this->Target->GetSourceDepends(*si);
- - this->WriteSource((d && !d->empty())? "None":"Object", *si);
- + // if we mark an object file as external, set it as Object
- + if ((*si)->GetPropertyAsBool("EXTERNAL_OBJECT"))
- + {
- + this->WriteSource("Object", *si);
- + }
- + else
- + {
- + // If an object file is generated in this target, then vs10 will use
- + // it in the build, and we have to list it as None instead of Object.
- + std::vector<cmSourceFile*> const* d = this->Target->GetSourceDepends(*si);
- + this->WriteSource((d && !d->empty())? "None":"Object", *si);
- + }
- }
- this->WriteSources("None", this->GeneratorTarget->ExtraSources);
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement