mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-03-12 20:39:49 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'osx-iframework'

Browse Source 
1bed75a5 OS X: Use -iframework for system framework directories
This commit is contained in:
Brad King
2014-05-07 09:13:37 -04:00
committed by CMake Topic Stage
parent 3e2e15eead 1bed75a590
commit 2e095099ec
3 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Source/cmLocalGenerator.cxx
View File

@@ -1344,6 +1344,12 @@ std::string cmLocalGenerator::GetIncludeFlags(
const char* fwSearchFlag =
this->Makefile->GetDefinition(fwSearchFlagVar);
std::string sysFwSearchFlagVar = "CMAKE_";
sysFwSearchFlagVar += lang;
sysFwSearchFlagVar += "_SYSTEM_FRAMEWORK_SEARCH_FLAG";
const char* sysFwSearchFlag =
this->Makefile->GetDefinition(sysFwSearchFlagVar);
bool flagUsed = false;
std::set<std::string> emitted;
#ifdef __APPLE__
@@ -1360,9 +1366,17 @@ std::string cmLocalGenerator::GetIncludeFlags(
frameworkDir = cmSystemTools::CollapseFullPath(frameworkDir.c_str());
if(emitted.insert(frameworkDir).second)
{
includeFlags
<< fwSearchFlag << this->Convert(frameworkDir,
START_OUTPUT, shellFormat, true)
if (sysFwSearchFlag && target &&
target->IsSystemIncludeDirectory(*i, config))
{
includeFlags << sysFwSearchFlag;
}
else
{
includeFlags << fwSearchFlag;
}
includeFlags << this->Convert(frameworkDir, START_OUTPUT,
shellFormat, true)
<< " ";
}
continue;