Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Remove hardcoded include path to cppunit/include and add it as a work…

…space path
  • Loading branch information...
commit 41a9005294afdfcd8cc583962119e8ade50d33d5 1 parent 837e24d
@hungc hungc authored Anthony Hu committed
Showing with 31 additions and 9 deletions.
  1. +30 −8 .cproject
  2. +1 −1  .project
View
38 .cproject
@@ -36,18 +36,20 @@
<listOptionValue builtIn="false" value="${workspace_loc:/${ProjName}/public}"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/usr/include/freetype2"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/../target-override/usr/include"/>
+ <listOptionValue builtIn="false" value="&quot;${workspace_loc:/cppunit/include}&quot;"/>
</option>
<option id="com.qnx.qcc.option.compiler.security.1018641543" name="Enhanced Security (-fstack-protector-all)" superClass="com.qnx.qcc.option.compiler.security" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.compiler.defines.384548056" name="Defines (-D)" superClass="com.qnx.qcc.option.compiler.defines" valueType="definedSymbols">
<listOptionValue builtIn="false" value="_FORTIFY_SOURCE=2"/>
</option>
- <option id="com.qnx.qcc.option.compiler.ccoptions.661895215" name="Compiler Options (-Wc,)" superClass="com.qnx.qcc.option.compiler.ccoptions" valueType="stringList">
- <listOptionValue builtIn="false" value="-IF:/ndk-2.0.0-workspace/cppunit/include"/>
- </option>
+ <option id="com.qnx.qcc.option.compiler.ccoptions.661895215" name="Compiler Options (-Wc,)" superClass="com.qnx.qcc.option.compiler.ccoptions" valueType="stringList"/>
<inputType id="com.qnx.qcc.inputType.compiler.589247791" superClass="com.qnx.qcc.inputType.compiler"/>
</tool>
<tool id="com.qnx.qcc.tool.assembler.1106780787" name="QCC Assembler" superClass="com.qnx.qcc.tool.assembler">
<option id="com.qnx.qcc.option.assembler.debug.1673901517" name="Debug (-g)" superClass="com.qnx.qcc.option.assembler.debug" value="true" valueType="boolean"/>
+ <option id="com.qnx.qcc.option.assembler.includePath.1063334056" name="Include Directories (-I)" superClass="com.qnx.qcc.option.assembler.includePath" valueType="includePath">
+ <listOptionValue builtIn="false" value="&quot;${workspace_loc:/cppunit/include}&quot;"/>
+ </option>
<inputType id="com.qnx.qcc.inputType.assembler.1409624522" superClass="com.qnx.qcc.inputType.assembler"/>
</tool>
<tool id="com.qnx.qcc.tool.linker.149327214" name="QCC Linker" superClass="com.qnx.qcc.tool.linker">
@@ -107,6 +109,7 @@
<listOptionValue builtIn="false" value="${workspace_loc:/${ProjName}/public}"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/usr/include/freetype2"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/../target-override/usr/include"/>
+ <listOptionValue builtIn="false" value="&quot;${workspace_loc:/cppunit/include}&quot;"/>
</option>
<option id="com.qnx.qcc.option.compiler.security.2031824449" name="Enhanced Security (-fstack-protector-all)" superClass="com.qnx.qcc.option.compiler.security" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.compiler.defines.71201125" name="Defines (-D)" superClass="com.qnx.qcc.option.compiler.defines" valueType="definedSymbols">
@@ -115,12 +118,11 @@
<option id="com.qnx.qcc.option.compiler.qccoptions.1501090785" name="QCC Options" superClass="com.qnx.qcc.option.compiler.qccoptions" valueType="stringList">
<listOptionValue builtIn="false" value="-frecord-gcc-switches"/>
</option>
- <option id="com.qnx.qcc.option.compiler.ccoptions.948689472" name="Compiler Options (-Wc,)" superClass="com.qnx.qcc.option.compiler.ccoptions" valueType="stringList">
- <listOptionValue builtIn="false" value="-IF:/ndk-2.0.0-workspace/cppunit/include"/>
- </option>
+ <option id="com.qnx.qcc.option.compiler.ccoptions.948689472" name="Compiler Options (-Wc,)" superClass="com.qnx.qcc.option.compiler.ccoptions" valueType="stringList"/>
<inputType id="com.qnx.qcc.inputType.compiler.344309900" superClass="com.qnx.qcc.inputType.compiler"/>
</tool>
<tool id="com.qnx.qcc.tool.assembler.1639475401" name="QCC Assembler" superClass="com.qnx.qcc.tool.assembler">
+ <option id="com.qnx.qcc.option.assembler.includePath.1969545237" name="Include Directories (-I)" superClass="com.qnx.qcc.option.assembler.includePath" valueType="includePath"/>
<inputType id="com.qnx.qcc.inputType.assembler.1098956114" superClass="com.qnx.qcc.inputType.assembler"/>
</tool>
<tool id="com.qnx.qcc.tool.linker.49261472" name="QCC Linker" superClass="com.qnx.qcc.tool.linker">
@@ -181,6 +183,7 @@
<listOptionValue builtIn="false" value="${workspace_loc:/${ProjName}/public}"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/usr/include/freetype2"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/../target-override/usr/include"/>
+ <listOptionValue builtIn="false" value="&quot;/${ProjName}/include&quot;"/>
</option>
<option id="com.qnx.qcc.option.compiler.security.1093782069" name="Enhanced Security (-fstack-protector-all)" superClass="com.qnx.qcc.option.compiler.security" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.compiler.defines.1574701092" name="Defines (-D)" superClass="com.qnx.qcc.option.compiler.defines" valueType="definedSymbols">
@@ -190,6 +193,9 @@
</tool>
<tool id="com.qnx.qcc.tool.assembler.304436564" name="QCC Assembler" superClass="com.qnx.qcc.tool.assembler">
<option id="com.qnx.qcc.option.assembler.debug.1546737309" name="Debug (-g)" superClass="com.qnx.qcc.option.assembler.debug" value="true" valueType="boolean"/>
+ <option id="com.qnx.qcc.option.assembler.includePath.1410439663" name="Include Directories (-I)" superClass="com.qnx.qcc.option.assembler.includePath" valueType="includePath">
+ <listOptionValue builtIn="false" value="&quot;${workspace_loc:/cppunit/include}&quot;"/>
+ </option>
<inputType id="com.qnx.qcc.inputType.assembler.2048629128" superClass="com.qnx.qcc.inputType.assembler"/>
</tool>
<tool id="com.qnx.qcc.tool.linker.1985900638" name="QCC Linker" superClass="com.qnx.qcc.tool.linker">
@@ -252,6 +258,7 @@
<listOptionValue builtIn="false" value="${workspace_loc:/${ProjName}/public}"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/usr/include/freetype2"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/../target-override/usr/include"/>
+ <listOptionValue builtIn="false" value="&quot;/${ProjName}/include&quot;"/>
</option>
<option id="com.qnx.qcc.option.compiler.security.1597285652" name="Enhanced Security (-fstack-protector-all)" superClass="com.qnx.qcc.option.compiler.security" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.compiler.defines.1742621739" name="Defines (-D)" superClass="com.qnx.qcc.option.compiler.defines" valueType="definedSymbols">
@@ -261,6 +268,9 @@
</tool>
<tool id="com.qnx.qcc.tool.assembler.900972416" name="QCC Assembler" superClass="com.qnx.qcc.tool.assembler">
<option id="com.qnx.qcc.option.assembler.debug.1206995404" name="Debug (-g)" superClass="com.qnx.qcc.option.assembler.debug" value="true" valueType="boolean"/>
+ <option id="com.qnx.qcc.option.assembler.includePath.1768922614" name="Include Directories (-I)" superClass="com.qnx.qcc.option.assembler.includePath" valueType="includePath">
+ <listOptionValue builtIn="false" value="&quot;${workspace_loc:/cppunit/include}&quot;"/>
+ </option>
<inputType id="com.qnx.qcc.inputType.assembler.297352375" superClass="com.qnx.qcc.inputType.assembler"/>
</tool>
<tool id="com.qnx.qcc.tool.linker.1845548536" name="QCC Linker" superClass="com.qnx.qcc.tool.linker">
@@ -321,6 +331,7 @@
<listOptionValue builtIn="false" value="${workspace_loc:/${ProjName}/public}"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/usr/include/freetype2"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/../target-override/usr/include"/>
+ <listOptionValue builtIn="false" value="&quot;/${ProjName}/include&quot;"/>
</option>
<option id="com.qnx.qcc.option.compiler.security.1527890505" name="Enhanced Security (-fstack-protector-all)" superClass="com.qnx.qcc.option.compiler.security" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.compiler.defines.1277881698" name="Defines (-D)" superClass="com.qnx.qcc.option.compiler.defines" valueType="definedSymbols">
@@ -330,6 +341,9 @@
</tool>
<tool id="com.qnx.qcc.tool.assembler.1725671937" name="QCC Assembler" superClass="com.qnx.qcc.tool.assembler">
<option id="com.qnx.qcc.option.assembler.debug.711600570" name="Debug (-g)" superClass="com.qnx.qcc.option.assembler.debug" value="true" valueType="boolean"/>
+ <option id="com.qnx.qcc.option.assembler.includePath.407644422" name="Include Directories (-I)" superClass="com.qnx.qcc.option.assembler.includePath" valueType="includePath">
+ <listOptionValue builtIn="false" value="&quot;${workspace_loc:/cppunit/include}&quot;"/>
+ </option>
<inputType id="com.qnx.qcc.inputType.assembler.1649580024" superClass="com.qnx.qcc.inputType.assembler"/>
</tool>
<tool id="com.qnx.qcc.tool.linker.91819330" name="QCC Linker" superClass="com.qnx.qcc.tool.linker">
@@ -390,6 +404,7 @@
<listOptionValue builtIn="false" value="${workspace_loc:/${ProjName}/public}"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/usr/include/freetype2"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/../target-override/usr/include"/>
+ <listOptionValue builtIn="false" value="&quot;/${ProjName}/include&quot;"/>
</option>
<option id="com.qnx.qcc.option.compiler.security.1404810514" name="Enhanced Security (-fstack-protector-all)" superClass="com.qnx.qcc.option.compiler.security" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.compiler.defines.358214472" name="Defines (-D)" superClass="com.qnx.qcc.option.compiler.defines" valueType="definedSymbols">
@@ -399,6 +414,9 @@
</tool>
<tool id="com.qnx.qcc.tool.assembler.386940315" name="QCC Assembler" superClass="com.qnx.qcc.tool.assembler">
<option id="com.qnx.qcc.option.assembler.debug.120286786" name="Debug (-g)" superClass="com.qnx.qcc.option.assembler.debug" value="true" valueType="boolean"/>
+ <option id="com.qnx.qcc.option.assembler.includePath.1696807245" name="Include Directories (-I)" superClass="com.qnx.qcc.option.assembler.includePath" valueType="includePath">
+ <listOptionValue builtIn="false" value="&quot;${workspace_loc:/cppunit/include}&quot;"/>
+ </option>
<inputType id="com.qnx.qcc.inputType.assembler.1507102313" superClass="com.qnx.qcc.inputType.assembler"/>
</tool>
<tool id="com.qnx.qcc.tool.linker.607647480" name="QCC Linker" superClass="com.qnx.qcc.tool.linker">
@@ -460,6 +478,7 @@
<listOptionValue builtIn="false" value="${workspace_loc:/${ProjName}/public}"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/usr/include/freetype2"/>
<listOptionValue builtIn="false" value="${QNX_TARGET}/../target-override/usr/include"/>
+ <listOptionValue builtIn="false" value="&quot;/${ProjName}/include&quot;"/>
</option>
<option id="com.qnx.qcc.option.compiler.security.1004034277" name="Enhanced Security (-fstack-protector-all)" superClass="com.qnx.qcc.option.compiler.security" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.compiler.defines.1338334214" name="Defines (-D)" superClass="com.qnx.qcc.option.compiler.defines" valueType="definedSymbols">
@@ -469,6 +488,9 @@
</tool>
<tool id="com.qnx.qcc.tool.assembler.794517685" name="QCC Assembler" superClass="com.qnx.qcc.tool.assembler">
<option id="com.qnx.qcc.option.assembler.debug.811886138" name="Debug (-g)" superClass="com.qnx.qcc.option.assembler.debug" value="true" valueType="boolean"/>
+ <option id="com.qnx.qcc.option.assembler.includePath.420832221" name="Include Directories (-I)" superClass="com.qnx.qcc.option.assembler.includePath" valueType="includePath">
+ <listOptionValue builtIn="false" value="&quot;${workspace_loc:/cppunit/include}&quot;"/>
+ </option>
<inputType id="com.qnx.qcc.inputType.assembler.350162319" superClass="com.qnx.qcc.inputType.assembler"/>
</tool>
<tool id="com.qnx.qcc.tool.linker.974159423" name="QCC Linker" superClass="com.qnx.qcc.tool.linker">
@@ -512,10 +534,10 @@
<scannerConfigBuildInfo instanceId="com.qnx.qcc.configuration.sharedLib.profile.1905911924">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="com.qnx.tools.ide.qde.managedbuilder.core.qccScannerInfo"/>
</scannerConfigBuildInfo>
- <scannerConfigBuildInfo instanceId="com.qnx.qcc.configuration.sharedLib.release.1173653159">
+ <scannerConfigBuildInfo instanceId="com.qnx.qcc.configuration.sharedLib.coverage.1857853503">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="com.qnx.tools.ide.qde.managedbuilder.core.qccScannerInfo"/>
</scannerConfigBuildInfo>
- <scannerConfigBuildInfo instanceId="com.qnx.qcc.configuration.sharedLib.coverage.1857853503">
+ <scannerConfigBuildInfo instanceId="com.qnx.qcc.configuration.sharedLib.release.1173653159">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="com.qnx.tools.ide.qde.managedbuilder.core.qccScannerInfo"/>
</scannerConfigBuildInfo>
<scannerConfigBuildInfo instanceId="com.qnx.qcc.configuration.sharedLib.debug.1527696864">
View
2  .project
@@ -27,7 +27,7 @@
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.buildLocation</key>
- <value>${workspace_loc:/cppunit/Device-Release}</value>
+ <value>${workspace_loc:/cppunit/Device-Debug}</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.contents</key>
Please sign in to comment.
Something went wrong with that request. Please try again.