diff options
| author | Brad King <brad.king@kitware.com> | 2008-02-18 21:38:34 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2008-02-18 21:38:34 (GMT) |
| commit | 9ed42663068bc8f5bc2510a2fb19b574c06f3a1f (patch) | |
| tree | 46768f04a5bc810e9b5abc1011b8ddd7a6bcbd95 /Source/cmGlobalXCodeGenerator.cxx | |
| parent | a3781c85fcaee3f49b95e101317a19594f575c98 (diff) | |
| download | CMake-9ed42663068bc8f5bc2510a2fb19b574c06f3a1f.zip CMake-9ed42663068bc8f5bc2510a2fb19b574c06f3a1f.tar.gz CMake-9ed42663068bc8f5bc2510a2fb19b574c06f3a1f.tar.bz2 | |
ENH: Cleanup impl of PUBLIC_HEADER, PRIVATE_HEADER, and RESOURCE properties
Diffstat (limited to 'Source/cmGlobalXCodeGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalXCodeGenerator.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index de62e8f..32323e5 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -493,21 +493,21 @@ cmGlobalXCodeGenerator::CreateXCodeSourceFile(cmLocalGenerator* lg, // Is this a resource file in this target? Add it to the resources group... // cmTarget::SourceFileFlags tsFlags = cmtarget.GetTargetSourceFileFlags(sf); - bool isResource = tsFlags.Resource; + bool isResource = (tsFlags.Type == cmTarget::SourceFileTypeResource); // Is this a "private" or "public" framework header file? // Set the ATTRIBUTES attribute appropriately... // if(cmtarget.IsFrameworkOnApple()) { - if(tsFlags.PrivateHeader) + if(tsFlags.Type == cmTarget::SourceFileTypePrivateHeader) { cmXCodeObject* attrs = this->CreateObject(cmXCodeObject::OBJECT_LIST); attrs->AddObject(this->CreateString("Private")); settings->AddAttribute("ATTRIBUTES", attrs); isResource = true; } - else if(tsFlags.PublicHeader) + else if(tsFlags.Type == cmTarget::SourceFileTypePublicHeader) { cmXCodeObject* attrs = this->CreateObject(cmXCodeObject::OBJECT_LIST); attrs->AddObject(this->CreateString("Public")); @@ -698,7 +698,7 @@ cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen, { headerFiles.push_back(xsf); } - else if(tsFlags.Resource) + else if(tsFlags.Type == cmTarget::SourceFileTypeResource) { resourceFiles.push_back(xsf); } @@ -785,12 +785,12 @@ cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen, for(std::vector<cmSourceFile*>::const_iterator i = classes.begin(); i != classes.end(); ++i) { - const char* contentLoc = (*i)->GetProperty("MACOSX_PACKAGE_LOCATION"); - if ( !contentLoc || cmStdString(contentLoc) == "Resources" ) + cmTarget::SourceFileFlags tsFlags = + cmtarget.GetTargetSourceFileFlags(*i); + if(tsFlags.Type == cmTarget::SourceFileTypeMacContent) { - continue; + bundleFiles[tsFlags.MacFolder].push_back(*i); } - bundleFiles[contentLoc].push_back(*i); } mapOfVectorOfSourceFiles::iterator mit; for ( mit = bundleFiles.begin(); mit != bundleFiles.end(); ++ mit ) |