diff options
Diffstat (limited to 'Source/cmMakefileTargetGenerator.cxx')
-rw-r--r-- | Source/cmMakefileTargetGenerator.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx index ee99b1c..cd08bdb 100644 --- a/Source/cmMakefileTargetGenerator.cxx +++ b/Source/cmMakefileTargetGenerator.cxx @@ -334,6 +334,9 @@ void cmMakefileTargetGenerator::WriteMacOSXContentRules(cmSourceFile& source, macdir += pkgloc; cmSystemTools::MakeDirectory(macdir.c_str()); + // Record use of this content location. + this->MacContentFolders.insert(pkgloc); + // Get the input file location. std::string input = source.GetFullPath(); @@ -1456,11 +1459,8 @@ void cmMakefileTargetGenerator if(cmTarget* tgt = this->GlobalGenerator->FindTarget(0, lib->first.c_str())) { - if(const char* location = - tgt->GetLocation(this->LocalGenerator->ConfigurationName.c_str())) - { - depends.push_back(location); - } + const char* config = this->LocalGenerator->ConfigurationName.c_str(); + depends.push_back(tgt->GetFullPath(config, false)); } // depend on full path libs as well else if(cmSystemTools::FileIsFullPath(lib->first.c_str())) |