diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2007-03-30 14:53:02 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2007-03-30 14:53:02 (GMT) |
| commit | 5ed2141d12c6be54902cb26a83d2b97fba8699cb (patch) | |
| tree | 70ea60b1d750db15599f25188f2370ff11f0d558 /Source | |
| parent | 32ab3853eee088f3da06cd49f67ade2b9947b4a4 (diff) | |
| download | CMake-5ed2141d12c6be54902cb26a83d2b97fba8699cb.zip CMake-5ed2141d12c6be54902cb26a83d2b97fba8699cb.tar.gz CMake-5ed2141d12c6be54902cb26a83d2b97fba8699cb.tar.bz2 | |
ENH: make sure default /System framework is not added with -F
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmGlobalXCodeGenerator.cxx | 1 | ||||
| -rw-r--r-- | Source/cmLocalGenerator.cxx | 3 | ||||
| -rw-r--r-- | Source/cmMakefileTargetGenerator.cxx | 1 |
3 files changed, 5 insertions, 0 deletions
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index 6c2d258..a5c4520 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -1287,6 +1287,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target, std::vector<std::string>::iterator i = includes.begin(); std::string fdirs; std::set<cmStdString> emitted; + emitted.insert("/System/Library/Frameworks"); for(;i != includes.end(); ++i) { if(cmSystemTools::IsPathToFramework(i->c_str())) diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index c7f50f6..a5fb1a0 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -1084,6 +1084,9 @@ const char* cmLocalGenerator::GetIncludeFlags(const char* lang) bool flagUsed = false; std::set<cmStdString> emitted; +#ifdef __APPLE__ + emitted.insert("/System/Library/Frameworks"); +#endif for(i = includes.begin(); i != includes.end(); ++i) { #ifdef __APPLE__ diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx index 0a1b9c8..523a6f7 100644 --- a/Source/cmMakefileTargetGenerator.cxx +++ b/Source/cmMakefileTargetGenerator.cxx @@ -1116,6 +1116,7 @@ std::string cmMakefileTargetGenerator::GetFrameworkFlags() return std::string(); #else std::set<cmStdString> emitted; + emitted.insert("/System/Library/Frameworks"); std::vector<std::string> includes; this->LocalGenerator->GetIncludeDirectories(includes); std::vector<std::string>::iterator i; |