kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'xcode-subdir-regen-dependencies'

Browse Source 
809ef30 Xcode: Make generation depend on all input directories
This commit is contained in:
Brad King 2011-01-19 14:28:15 -05:00 committed by CMake Topic Stage
commit 20d11b9a33
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Source/cmGlobalXCodeGenerator.cxx
View File

@ -355,7 +355,7 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
cmCustomCommandLines commandLines; cmCustomCommandLines commandLines;
commandLines.push_back(makecommand); commandLines.push_back(makecommand);
// Add Re-Run CMake rules // Add Re-Run CMake rules
this->CreateReRunCMakeFile(root); this->CreateReRunCMakeFile(root, gens);
// now make the allbuild depend on all the non-utility targets // now make the allbuild depend on all the non-utility targets
// in the project // in the project
@ -403,10 +403,18 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void cmGlobalXCodeGenerator::CreateReRunCMakeFile(cmLocalGenerator* root) void cmGlobalXCodeGenerator::CreateReRunCMakeFile(
cmLocalGenerator* root, std::vector<cmLocalGenerator*> const& gens)
{ {
cmMakefile* mf = root->GetMakefile(); cmMakefile* mf = root->GetMakefile();
std::vector<std::string> lfiles = mf->GetListFiles(); std::vector<std::string> lfiles;
for(std::vector<cmLocalGenerator*>::const_iterator gi = gens.begin();
gi != gens.end(); ++gi)
{
std::vector<std::string> const& lf = (*gi)->GetMakefile()->GetListFiles();
lfiles.insert(lfiles.end(), lf.begin(), lf.end());
}
// sort the array // sort the array
std::sort(lfiles.begin(), lfiles.end(), std::less<std::string>()); std::sort(lfiles.begin(), lfiles.end(), std::less<std::string>());
std::vector<std::string>::iterator new_end = std::vector<std::string>::iterator new_end =

3
Source/cmGlobalXCodeGenerator.h
View File

@ -171,7 +171,8 @@ private:
const char* name2, const char* name2,
cmTarget& cmtarget, cmTarget& cmtarget,
const std::vector<cmCustomCommand>&); const std::vector<cmCustomCommand>&);
void CreateReRunCMakeFile(cmLocalGenerator* root); void CreateReRunCMakeFile(cmLocalGenerator* root,
std::vector<cmLocalGenerator*> const& gens);
std::string LookupFlags(const char* varNamePrefix, std::string LookupFlags(const char* varNamePrefix,
const char* varNameLang, const char* varNameLang,