diff options
| author | David Cole <david.cole@kitware.com> | 2007-08-01 13:04:45 -0400 |
|---|---|---|
| committer | David Cole <david.cole@kitware.com> | 2007-08-01 13:04:45 -0400 |
| commit | ee91e2549921075b02f0a88fb48323b1c015228c (patch) | |
| tree | e4189d3f1043bfc292981ceff2e7bf00bbf548ea /Source/cmGlobalXCodeGenerator.cxx | |
| parent | a0533be267e0304b3a13f17c3adc660e8a830f71 (diff) | |
| download | cmake-ee91e2549921075b02f0a88fb48323b1c015228c.tar.gz | |
BUG: Only pay attention to the FRAMEWORK target property for SHARED library targets
Diffstat (limited to 'Source/cmGlobalXCodeGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalXCodeGenerator.cxx | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index 7a66cf5bd5..f4c6411773 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -727,7 +727,8 @@ cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen, buildFiles->AddObject(xsf); } } - if(cmtarget.GetPropertyAsBool("FRAMEWORK")) + if (cmtarget.GetType() == cmTarget::SHARED_LIBRARY && + cmtarget.GetPropertyAsBool("FRAMEWORK")) { this->AddFrameworkPhases(&cmtarget, buildPhases); } @@ -1239,7 +1240,8 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target, target.GetType() == cmTarget::EXECUTABLE) { std::string pndir = target.GetDirectory(); - if(target.GetPropertyAsBool("FRAMEWORK")) + if (target.GetType() == cmTarget::SHARED_LIBRARY && + target.GetPropertyAsBool("FRAMEWORK")) { pndir += "/.."; pndir = cmSystemTools::CollapseFullPath(pndir.c_str()); @@ -2053,7 +2055,8 @@ void cmGlobalXCodeGenerator::CreateGroups(cmLocalGenerator* root, } std::vector<cmSourceFile*> classes = cmtarget.GetSourceFiles(); // add framework copy headers - if(cmtarget.GetPropertyAsBool("FRAMEWORK")) + if (cmtarget.GetType() == cmTarget::SHARED_LIBRARY && + cmtarget.GetPropertyAsBool("FRAMEWORK")) { const char* headers = cmtarget.GetProperty("FRAMEWORK_PUBLIC_HEADERS"); if(!headers) |