mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-04-29 19:45:01 +02:00
Fix for configuration context calculation
This commit is contained in:
parent
57917d77fd
commit
b224117ea2
1 changed files with 18 additions and 0 deletions
|
@ -167,6 +167,24 @@ public class DefaultMacroContextInfo implements IMacroContextInfo {
|
||||||
return new DefaultMacroContextInfo(
|
return new DefaultMacroContextInfo(
|
||||||
IBuildMacroProvider.CONTEXT_CONFIGURATION,
|
IBuildMacroProvider.CONTEXT_CONFIGURATION,
|
||||||
((IToolChain)ho).getParent());
|
((IToolChain)ho).getParent());
|
||||||
|
else {
|
||||||
|
IBuildObject buildObj = optionContext.getParent();
|
||||||
|
IConfiguration cfg = null;
|
||||||
|
if(buildObj instanceof ITool)
|
||||||
|
buildObj = ((ITool)buildObj).getParent();
|
||||||
|
if(buildObj instanceof IToolChain)
|
||||||
|
cfg = ((IToolChain)buildObj).getParent();
|
||||||
|
else if(buildObj instanceof IResourceConfiguration)
|
||||||
|
cfg = ((IResourceConfiguration)buildObj).getParent();
|
||||||
|
else if(buildObj instanceof IConfiguration)
|
||||||
|
cfg = (IConfiguration)buildObj;
|
||||||
|
|
||||||
|
if(cfg != null){
|
||||||
|
return new DefaultMacroContextInfo(
|
||||||
|
IBuildMacroProvider.CONTEXT_CONFIGURATION,
|
||||||
|
cfg);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case IBuildMacroProvider.CONTEXT_TOOL:
|
case IBuildMacroProvider.CONTEXT_TOOL:
|
||||||
|
|
Loading…
Add table
Reference in a new issue