Index: Source/cmExtraEclipseCDT4Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmExtraEclipseCDT4Generator.cxx,v
retrieving revision 1.5
diff -u -r1.5 cmExtraEclipseCDT4Generator.cxx
--- Source/cmExtraEclipseCDT4Generator.cxx	17 Aug 2007 14:05:39 -0000	1.5
+++ Source/cmExtraEclipseCDT4Generator.cxx	2 Oct 2007 20:05:16 -0000
@@ -506,6 +506,66 @@
       fout << "<pathentry kind=\"out\" path=\"" << name << "\"/>\n";
       }
     }
+  // add mac entries directing Eclipse to use the DISCOVERED_SCANNER_INFO
+  // to determine what these defines are set to at compile time.
+  // NOTE:
+  // this is better than nothing but not perfect primarily because
+  // targets could be compiled multiple times with CMake with different
+  // preprocessor definitions.
+  std::set<cmStdString> definitions_added_to_eclipse;
+  for (std::map<cmStdString, std::vector<cmLocalGenerator*> >::const_iterator
+        mitr = this->GlobalGenerator->GetProjectMap().begin();
+        mitr != this->GlobalGenerator->GetProjectMap().end();
+       ++mitr)
+    {
+      std::vector<cmLocalGenerator*> const vlg = mitr->second;
+      for(std::vector<cmLocalGenerator*>::const_iterator
+           vitr = vlg.begin();
+           vitr != vlg.end();
+           ++vitr)
+        {
+          cmLocalGenerator const *gen = *vitr;
+          cmMakefile const *makefile = gen->GetMakefile();
+          if(makefile && makefile->GetDefineFlags())
+            {
+              //std::cout << "DefineFlags for " << mitr->first << " = " << makefile->GetDefineFlags() << std::endl;
+              cmStdString defs(makefile->GetDefineFlags());
+              // Search for each "-D" to find definitions.  Add them to the list of
+              // compiler definitions to be discovered.
+              cmStdString::size_type idx = 0;
+              while(idx <= defs.length())
+                {
+                  idx = defs.find(" -D", idx);
+                  if(idx != cmStdString::npos )
+                    {
+                    idx += 3;
+                    cmStdString::size_type enddef = defs.find(' ', idx);
+                    cmStdString::size_type equals = defs.find('=', idx);
+
+                    cmStdString the_def, the_value;
+                    if(equals != cmStdString::npos && equals < enddef)
+                      {
+                      // We have -DFOO=BAR
+                      the_def   = defs.substr(idx, equals-idx);
+                      }
+                    else
+                      {
+                      // We have -DFOO
+                      the_def = defs.substr(idx, enddef-idx);
+                      }
+
+                    if(definitions_added_to_eclipse.count(the_def) == 0)
+                      {
+                      definitions_added_to_eclipse.insert(the_def);
+                      fout << "<pathentry base-ref=\"org.eclipse.cdt.make.core.DISCOVERED_SCANNER_INFO\" kind=\"mac\" name=\""
+                           << the_def << "\" path=\"\" value=\"\"/>\n";
+                      }
+                    idx = enddef;
+                    }
+                }
+            }
+        }
+    }
 
   // include dirs
   emmited.clear();
Index: Source/cmMakefile.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmMakefile.h,v
retrieving revision 1.215
diff -u -r1.215 cmMakefile.h
--- Source/cmMakefile.h	26 Aug 2007 07:17:10 -0000	1.215
+++ Source/cmMakefile.h	2 Oct 2007 20:05:17 -0000
@@ -524,7 +524,7 @@
   /**
    * Get a list of preprocessor define flags.
    */
-  const char* GetDefineFlags()
+  const char* GetDefineFlags() const
     {return this->DefineFlags.c_str();}
 
   /**