diff options
author | Brad King <brad.king@kitware.com> | 2008-01-28 18:05:58 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2008-01-28 18:05:58 (GMT) |
commit | 28ea03473785eddce544704306a239407a8f79bb (patch) | |
tree | ee4df3ce5aebf8d96f679db2b26304efb90fe9ba /Source/cmGlobalXCodeGenerator.cxx | |
parent | 3d94b3b7170b17f119608a896f2e86cba23b6c5b (diff) | |
download | CMake-28ea03473785eddce544704306a239407a8f79bb.zip CMake-28ea03473785eddce544704306a239407a8f79bb.tar.gz CMake-28ea03473785eddce544704306a239407a8f79bb.tar.bz2 |
ENH: Support exporting/importing of Framework targets.
- Imported frameworks have the FRAMEWORK property set
- Added cmTarget::IsFrameworkOnApple method to simplify checks
- Also remove separate IMPORTED_ENABLE_EXPORTS property and just use ENABLE_EXPORTS since, like FRAMEWORK, it just represents the target type.
- Document FRAMEWORK keyword in INSTALL command.
- Updated IMPORTED_LOCATION property documentation for Frameworks
Diffstat (limited to 'Source/cmGlobalXCodeGenerator.cxx')
-rw-r--r-- | Source/cmGlobalXCodeGenerator.cxx | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index 19394f2..f1a2b71 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -498,8 +498,7 @@ cmGlobalXCodeGenerator::CreateXCodeSourceFile(cmLocalGenerator* lg, // Is this a "private" or "public" framework header file? // Set the ATTRIBUTES attribute appropriately... // - if(cmtarget.GetType() == cmTarget::SHARED_LIBRARY && - cmtarget.GetPropertyAsBool("FRAMEWORK")) + if(cmtarget.IsFrameworkOnApple()) { if(tsFlags.PrivateHeader) { @@ -710,8 +709,7 @@ cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen, } // some build phases only apply to bundles and/or frameworks - bool isFrameworkTarget = cmtarget.GetType() == cmTarget::SHARED_LIBRARY && - cmtarget.GetPropertyAsBool("FRAMEWORK"); + bool isFrameworkTarget = cmtarget.IsFrameworkOnApple(); bool isBundleTarget = cmtarget.GetPropertyAsBool("MACOSX_BUNDLE"); cmXCodeObject* buildFiles = 0; @@ -1359,8 +1357,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target, target.GetType() == cmTarget::EXECUTABLE) { std::string pndir = target.GetDirectory(); - if (target.GetType() == cmTarget::SHARED_LIBRARY && - target.GetPropertyAsBool("FRAMEWORK")) + if(target.IsFrameworkOnApple()) { pndir += "/.."; pndir = cmSystemTools::CollapseFullPath(pndir.c_str()); |