[cmake-commits] hoffman committed cmGlobalXCodeGenerator.cxx 1.141
1.142 cmLocalGenerator.cxx 1.206 1.207
cmMakefileTargetGenerator.cxx 1.60 1.61
cmake-commits at cmake.org
cmake-commits at cmake.org
Fri Mar 30 09:53:04 EST 2007
Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv27123/Source
Modified Files:
cmGlobalXCodeGenerator.cxx cmLocalGenerator.cxx
cmMakefileTargetGenerator.cxx
Log Message:
ENH: make sure default /System framework is not added with -F
Index: cmGlobalXCodeGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalXCodeGenerator.cxx,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -d -r1.141 -r1.142
--- cmGlobalXCodeGenerator.cxx 28 Mar 2007 03:15:59 -0000 1.141
+++ cmGlobalXCodeGenerator.cxx 30 Mar 2007 14:53:02 -0000 1.142
@@ -1287,6 +1287,7 @@
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()))
Index: cmLocalGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalGenerator.cxx,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -d -r1.206 -r1.207
--- cmLocalGenerator.cxx 22 Mar 2007 13:45:24 -0000 1.206
+++ cmLocalGenerator.cxx 30 Mar 2007 14:53:02 -0000 1.207
@@ -1084,6 +1084,9 @@
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__
Index: cmMakefileTargetGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmMakefileTargetGenerator.cxx,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- cmMakefileTargetGenerator.cxx 28 Mar 2007 03:13:25 -0000 1.60
+++ cmMakefileTargetGenerator.cxx 30 Mar 2007 14:53:02 -0000 1.61
@@ -1116,6 +1116,7 @@
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;
More information about the Cmake-commits
mailing list