mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-23 06:32:10 +02:00
Code Issues Wiki Activity

Include directories starting with ${workspace_loc} should be treated as filesystem ones, not workspace ones.

Browse source
This commit is contained in:
Sergey Prigogin 2011-05-25 03:55:35 +00:00
parent e9eeb2b478
commit 6eea032c76
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildEntryStorage.java
View file

@ -590,12 +590,14 @@ public class BuildEntryStorage extends AbstractEntryStorage {
private static PathInfo optionPathValueToEntry(String str, SupplierBasedCdtVariableSubstitutor subst) { private static PathInfo optionPathValueToEntry(String str, SupplierBasedCdtVariableSubstitutor subst) {
String unresolvedStr = ManagedBuildManager.locationToFullPath(str); String unresolvedStr = ManagedBuildManager.locationToFullPath(str);
boolean isWorkspacePath; boolean isWorkspacePath = false;
if (unresolvedStr != null) { if (unresolvedStr == null) {
isWorkspacePath = true;
} else {
unresolvedStr = str; unresolvedStr = str;
isWorkspacePath = false; } else {
// A path starting from "${workspace_loc}" is always a filesystem path.
if (!unresolvedStr.startsWith("${workspace_loc}")) { //$NON-NLS-1$
isWorkspacePath = true;
}
} }
return new PathInfo(unresolvedStr, isWorkspacePath, subst); return new PathInfo(unresolvedStr, isWorkspacePath, subst);
} }