From 20244e1c9abca552f338c6c3827871e070b94ba2 Mon Sep 17 00:00:00 2001
From: Sebastian Huber <sebastian.huber@embedded-brains.de>
Date: Fri, 27 Nov 2009 08:31:46 +0000
Subject: Fixed nature filter for C++ compiler. Added "envVarBuildPath" to GCC
 derived tools.

---
 org.rtems.cdt/plugin.xml | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/org.rtems.cdt/plugin.xml b/org.rtems.cdt/plugin.xml
index 6d05511..c209399 100644
--- a/org.rtems.cdt/plugin.xml
+++ b/org.rtems.cdt/plugin.xml
@@ -442,11 +442,15 @@
                   scannerConfigDiscoveryProfileId="org.rtems.cdt.RtemsSCDProfileC"
                   sourceContentType="org.eclipse.cdt.core.cSource"
                   sources="c"/>
+            <envVarBuildPath 
+                  pathType="buildpathInclude"
+                  variableList="CPATH,C_INCLUDE_PATH"/>
          </tool>
          <tool
                id="org.rtems.cdt.compiler.cpp"
                name="RTEMS C++ Compiler"
-               superClass="org.rtems.cdt.tool.gcc">
+               superClass="org.rtems.cdt.tool.gcc"
+               natureFilter="ccnature">
             <inputType
                   id="org.rtems.cdt.compiler.cpp.input"
                   dependencyCalculator="org.eclipse.cdt.managedbuilder.makegen.gnu.DefaultGCCDependencyCalculator2"
@@ -456,6 +460,9 @@
                   scannerConfigDiscoveryProfileId="org.rtems.cdt.RtemsSCDProfileCPP"
                   sourceContentType="org.eclipse.cdt.core.cxxSource"
                   sources="c,C,cc,cxx,cpp"/>
+            <envVarBuildPath 
+                  pathType="buildpathInclude"
+                  variableList="CPATH,CPLUS_INCLUDE_PATH"/>
          </tool>
          <tool
                commandLineGenerator="org.rtems.cdt.build.CommandLineGenerator"
@@ -505,10 +512,10 @@
             </enablement>
          </tool>
          <tool
-               commandLineGenerator="org.rtems.cdt.build.CommandLineGenerator"
                id="org.rtems.cdt.linker.cpp"
                name="RTEMS C++ Linker"
-               superClass="cdt.managedbuild.tool.gnu.cpp.linker">
+               superClass="cdt.managedbuild.tool.gnu.cpp.linker"
+               commandLineGenerator="org.rtems.cdt.build.CommandLineGenerator">
             <enablement type="ALL">
                <not>
                <checkBuildProperty
@@ -553,11 +560,16 @@
                   scannerConfigDiscoveryProfileId="org.rtems.cdt.RtemsSCDProfileWinC"
                   sourceContentType="org.eclipse.cdt.core.cSource"
                   sources="c"/>
+            <envVarBuildPath 
+                  pathType="buildpathInclude"
+                  variableList="CPATH,C_INCLUDE_PATH"
+                  buildPathResolver="org.eclipse.cdt.managedbuilder.gnu.cygwin.CygwinPathResolver"/>
          </tool>
          <tool
                id="org.rtems.cdt.compiler.cpp.cygwin"
                name="RTEMS C++ Compiler (Cygwin)"
                superClass="org.rtems.cdt.tool.gcc"
+               natureFilter="ccnature"
                commandLineGenerator="org.rtems.cdt.build.CygwinCommandLineGenerator">
             <inputType
                   id="org.rtems.cdt.compiler.cpp.input.cygwin"
@@ -568,6 +580,10 @@
                   scannerConfigDiscoveryProfileId="org.rtems.cdt.RtemsSCDProfileWinCPP"
                   sourceContentType="org.eclipse.cdt.core.cxxSource"
                   sources="c,C,cc,cxx,cpp"/>
+            <envVarBuildPath 
+                  pathType="buildpathInclude"
+                  variableList="CPATH,CPLUS_INCLUDE_PATH"
+                  buildPathResolver="org.eclipse.cdt.managedbuilder.gnu.cygwin.CygwinPathResolver"/>
          </tool>
          <tool
                commandLineGenerator="org.rtems.cdt.build.CygwinCommandLineGenerator"
@@ -583,10 +599,10 @@
             </enablement>
          </tool>
          <tool
-               commandLineGenerator="org.rtems.cdt.build.CygwinCommandLineGenerator"
                id="org.rtems.cdt.linker.cpp.cygwin"
                name="RTEMS C++ Linker (Cygwin)"
-               superClass="cdt.managedbuild.tool.gnu.cpp.linker.cygwin">
+               superClass="cdt.managedbuild.tool.gnu.cpp.linker.cygwin"
+               commandLineGenerator="org.rtems.cdt.build.CygwinCommandLineGenerator">
             <enablement type="ALL">
                <not>
                <checkBuildProperty
-- 
cgit v1.2.3