diff options
| author | Alex Neundorf <neundorf@kde.org> | 2010-04-19 18:28:29 (GMT) |
|---|---|---|
| committer | Alex Neundorf <neundorf@kde.org> | 2010-04-21 19:01:06 (GMT) |
| commit | b3843bab6045c38b35fb8a2463fdfdf9fc9d7db3 (patch) | |
| tree | 2b659861c1678fac4e940149a5a0daa3cefa6ab4 /Source/cmComputeLinkInformation.cxx | |
| parent | 45d9106eefafe3b9158e6890e44be643a0f7ff64 (diff) | |
| download | CMake-b3843bab6045c38b35fb8a2463fdfdf9fc9d7db3.zip CMake-b3843bab6045c38b35fb8a2463fdfdf9fc9d7db3.tar.gz CMake-b3843bab6045c38b35fb8a2463fdfdf9fc9d7db3.tar.bz2 | |
-fix linking to frameworks when crosscompiling from Linux to iPhone (#10526)
Alex
Diffstat (limited to 'Source/cmComputeLinkInformation.cxx')
| -rw-r--r-- | Source/cmComputeLinkInformation.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx index d84da52..9236ad572 100644 --- a/Source/cmComputeLinkInformation.cxx +++ b/Source/cmComputeLinkInformation.cxx @@ -1326,13 +1326,14 @@ void cmComputeLinkInformation::AddFrameworkItem(std::string const& item) //---------------------------------------------------------------------------- void cmComputeLinkInformation::AddDirectoryItem(std::string const& item) { -#ifdef __APPLE__ + std::string systemName = + this->Makefile->GetSafeDefinition("CMAKE_SYSTEM_NAME"); + if(systemName == "Darwin" && cmSystemTools::IsPathToFramework(item.c_str())) if(cmSystemTools::IsPathToFramework(item.c_str())) { this->AddFrameworkItem(item); } else -#endif { this->DropDirectoryItem(item); } |