From 5ed2141d12c6be54902cb26a83d2b97fba8699cb Mon Sep 17 00:00:00 2001 From: Bill Hoffman Date: Fri, 30 Mar 2007 10:53:02 -0400 Subject: ENH: make sure default /System framework is not added with -F --- Source/cmGlobalXCodeGenerator.cxx | 1 + Source/cmLocalGenerator.cxx | 3 +++ Source/cmMakefileTargetGenerator.cxx | 1 + 3 files changed, 5 insertions(+) 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::iterator i = includes.begin(); std::string fdirs; std::set 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 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 emitted; + emitted.insert("/System/Library/Frameworks"); std::vector includes; this->LocalGenerator->GetIncludeDirectories(includes); std::vector::iterator i; -- cgit v0.12