summaryrefslogtreecommitdiff
path: root/Source/cmInstallCommand.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2008-01-28 13:05:58 -0500
committerBrad King <brad.king@kitware.com>2008-01-28 13:05:58 -0500
commit28ea03473785eddce544704306a239407a8f79bb (patch)
treeee4df3ce5aebf8d96f679db2b26304efb90fe9ba /Source/cmInstallCommand.cxx
parent3d94b3b7170b17f119608a896f2e86cba23b6c5b (diff)
downloadcmake-28ea03473785eddce544704306a239407a8f79bb.tar.gz
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/cmInstallCommand.cxx')
-rw-r--r--Source/cmInstallCommand.cxx6
1 files changed, 2 insertions, 4 deletions
diff --git a/Source/cmInstallCommand.cxx b/Source/cmInstallCommand.cxx
index 6c742b9484..863f138d30 100644
--- a/Source/cmInstallCommand.cxx
+++ b/Source/cmInstallCommand.cxx
@@ -376,7 +376,7 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<std::string> const& args)
// This is a non-DLL platform.
// If it is marked with FRAMEWORK property use the FRAMEWORK set of
// INSTALL properties. Otherwise, use the LIBRARY properties.
- if(target.GetPropertyAsBool("FRAMEWORK"))
+ if(target.IsFrameworkOnApple())
{
// Use the FRAMEWORK properties.
if (!frameworkArgs.GetDestination().empty())
@@ -512,9 +512,7 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<std::string> const& args)
//
bool createInstallGeneratorsForTargetFileSets = true;
- if(cmTarget::SHARED_LIBRARY == target.GetType() &&
- target.GetPropertyAsBool("FRAMEWORK") &&
- this->Makefile->IsOn("APPLE"))
+ if(target.IsFrameworkOnApple())
{
createInstallGeneratorsForTargetFileSets = false;
}