From f3c54d18dfe54dc15281fdeaa41005f6b4404e2f Mon Sep 17 00:00:00 2001 From: Mikhail Sennikovsky Date: Mon, 19 Nov 2007 12:16:10 +0000 Subject: [PATCH] fix for exported settings --- .../managedbuilder/internal/core/Configuration.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Configuration.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Configuration.java index a994032f429..fdefd39f4f0 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Configuration.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Configuration.java @@ -2699,9 +2699,17 @@ public class Configuration extends BuildObject implements IConfiguration, IBuild List list = new ArrayList(entries.length + 1); list.add(new CIncludePathEntry(path.toString(), ICLanguageSettingEntry.VALUE_WORKSPACE_PATH)); + + entries = CDataUtil.resolveEntries(entries, des); for(int i = 0; i < entries.length; i++){ ICOutputEntry out = entries[i]; - ICLibraryPathEntry lib = new CLibraryPathEntry(out.getValue(), out.getFlags() & (~ICLanguageSettingEntry.RESOLVED)); + String value = out.getValue(); + + IPath p = new Path(value); + if(!p.isAbsolute()) + value = getOwner().getFullPath().append(value).toString(); + + ICLibraryPathEntry lib = new CLibraryPathEntry(value, out.getFlags() & (~ICSettingEntry.RESOLVED)); list.add(lib); }