mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-04-23 06:32:10 +02:00
Include directories starting with ${workspace_loc} should be treated as filesystem ones, not workspace ones.
This commit is contained in:
parent
e9eeb2b478
commit
6eea032c76
1 changed files with 7 additions and 5 deletions
|
@ -590,12 +590,14 @@ public class BuildEntryStorage extends AbstractEntryStorage {
|
|||
|
||||
private static PathInfo optionPathValueToEntry(String str, SupplierBasedCdtVariableSubstitutor subst) {
|
||||
String unresolvedStr = ManagedBuildManager.locationToFullPath(str);
|
||||
boolean isWorkspacePath;
|
||||
if (unresolvedStr != null) {
|
||||
isWorkspacePath = true;
|
||||
} else {
|
||||
boolean isWorkspacePath = false;
|
||||
if (unresolvedStr == null) {
|
||||
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);
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue