mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-04-23 14:42:11 +02:00
Fix for [Bug 182465] Creating new CDT project with make adds include directories
This commit is contained in:
parent
f6bce6cadf
commit
f51c347096
1 changed files with 17 additions and 4 deletions
|
@ -135,10 +135,23 @@ public class CfgScannerConfigInfoFactory2 {
|
||||||
|
|
||||||
if(info == null){
|
if(info == null){
|
||||||
String id = cfg.getDiscoveryProfileId();
|
String id = cfg.getDiscoveryProfileId();
|
||||||
|
IScannerConfigBuilderInfo2 prefInfo = null;
|
||||||
|
if(!cfg.isPreference()){
|
||||||
|
IConfiguration prefCfg = ManagedBuildManager.getPreferenceConfiguration(false);
|
||||||
|
ICfgScannerConfigBuilderInfo2Set prefContainer = create(prefCfg);
|
||||||
|
prefInfo = prefContainer.getInfo(new CfgInfoContext(prefCfg));
|
||||||
|
}
|
||||||
|
if(prefInfo == null){
|
||||||
if(id != null)
|
if(id != null)
|
||||||
info = container.createInfo(baseContext, id);
|
info = container.createInfo(baseContext, id);
|
||||||
else
|
else
|
||||||
info = container.createInfo(baseContext);
|
info = container.createInfo(baseContext);
|
||||||
|
} else {
|
||||||
|
if(id != null)
|
||||||
|
info = container.createInfo(baseContext, prefInfo, id);
|
||||||
|
else
|
||||||
|
info = container.createInfo(baseContext, prefInfo, prefInfo.getSelectedProfileId());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
map.put(new CfgInfoContext(cfg), info);
|
map.put(new CfgInfoContext(cfg), info);
|
||||||
} else {
|
} else {
|
||||||
|
|
Loading…
Add table
Reference in a new issue