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/cmComputeLinkInformation.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/cmComputeLinkInformation.cxx')
| -rw-r--r-- | Source/cmComputeLinkInformation.cxx | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx index 4d0d93a..b614de8 100644 --- a/Source/cmComputeLinkInformation.cxx +++ b/Source/cmComputeLinkInformation.cxx @@ -337,9 +337,8 @@ void cmComputeLinkInformation::AddItem(std::string const& item, // Pass the full path to the target file. std::string lib = tgt->GetFullPath(config, implib); this->Depends.push_back(lib); -#ifdef __APPLE__ - if(tgt->GetType() == cmTarget::SHARED_LIBRARY && - tgt->GetPropertyAsBool("FRAMEWORK")) + + if(tgt->IsFrameworkOnApple()) { // Frameworks on OS X need only the framework directory to // link. @@ -347,7 +346,6 @@ void cmComputeLinkInformation::AddItem(std::string const& item, this->AddFrameworkItem(fw); } else -#endif { this->AddTargetItem(lib, tgt); this->AddLibraryRuntimeInfo(lib, tgt); |