diff options
Diffstat (limited to 'Source/cmMakefileTargetGenerator.cxx')
| -rw-r--r-- | Source/cmMakefileTargetGenerator.cxx | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx index d0b5de3..2f5e120 100644 --- a/Source/cmMakefileTargetGenerator.cxx +++ b/Source/cmMakefileTargetGenerator.cxx @@ -237,8 +237,6 @@ void cmMakefileTargetGenerator::WriteCommonCodeRules() } } - - //---------------------------------------------------------------------------- void cmMakefileTargetGenerator::WriteObjectRuleFiles(cmSourceFile& source) { @@ -282,6 +280,10 @@ void cmMakefileTargetGenerator::WriteObjectRuleFiles(cmSourceFile& source) (this->LocalGenerator->ConvertToFullPath(dir).c_str()); // Save this in the target's list of object files. + if ( source.GetPropertyAsBool("EXTRA_CONTENT") ) + { + this->ExtraContent.insert(obj); + } this->Objects.push_back(obj); std::string relativeObj = this->LocalGenerator->GetHomeRelativeOutputPath(); relativeObj += obj; @@ -587,6 +589,7 @@ void cmMakefileTargetGenerator } } +//---------------------------------------------------------------------------- void cmMakefileTargetGenerator::WriteCustomCommands() { // add custom commands to the clean rules? @@ -667,6 +670,10 @@ cmMakefileTargetGenerator for(std::vector<std::string>::const_iterator i = this->Objects.begin(); i != this->Objects.end(); ++i) { + if ( this->ExtraContent.find(i->c_str()) != this->ExtraContent.end() ) + { + continue; + } *this->BuildFileStream << " " << lineContinue << "\n"; if(objName) { |