kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ENH: make sure default /System framework is not added with -F

This commit is contained in:
Bill Hoffman 2007-03-30 10:53:02 -04:00
parent 32ab3853ee
commit 5ed2141d12
3 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/cmGlobalXCodeGenerator.cxx
View File

@ -1287,6 +1287,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
std::vector<std::string>::iterator i = includes.begin(); std::vector<std::string>::iterator i = includes.begin();
std::string fdirs; std::string fdirs;
std::set<cmStdString> emitted; std::set<cmStdString> emitted;
emitted.insert("/System/Library/Frameworks");
for(;i != includes.end(); ++i) for(;i != includes.end(); ++i)
{ {
if(cmSystemTools::IsPathToFramework(i->c_str())) if(cmSystemTools::IsPathToFramework(i->c_str()))

3
Source/cmLocalGenerator.cxx
View File

@ -1084,6 +1084,9 @@ const char* cmLocalGenerator::GetIncludeFlags(const char* lang)
bool flagUsed = false; bool flagUsed = false;
std::set<cmStdString> emitted; std::set<cmStdString> emitted;
#ifdef __APPLE__
emitted.insert("/System/Library/Frameworks");
#endif
for(i = includes.begin(); i != includes.end(); ++i) for(i = includes.begin(); i != includes.end(); ++i)
{ {
#ifdef __APPLE__ #ifdef __APPLE__

1
Source/cmMakefileTargetGenerator.cxx
View File

@ -1116,6 +1116,7 @@ std::string cmMakefileTargetGenerator::GetFrameworkFlags()
return std::string(); return std::string();
#else #else
std::set<cmStdString> emitted; std::set<cmStdString> emitted;
emitted.insert("/System/Library/Frameworks");
std::vector<std::string> includes; std::vector<std::string> includes;
this->LocalGenerator->GetIncludeDirectories(includes); this->LocalGenerator->GetIncludeDirectories(includes);
std::vector<std::string>::iterator i; std::vector<std::string>::iterator i;