mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

Fixed bug breaking JUnit test

Browse source
This commit is contained in:
Andrew Gvozdev 2011-10-20 17:18:18 -04:00
parent 08529151de
commit 470ce6cd41
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/scannerconfig/AbstractLanguageSettingsOutputScanner.java
View file

@ -452,7 +452,9 @@ public abstract class AbstractLanguageSettingsOutputScanner extends LanguageSett
} }
if (buildDirURI == null && currentCfgDescription != null) { if (buildDirURI == null && currentCfgDescription != null) {
String builderCWD = currentCfgDescription.getBuildSetting().getBuilderCWD().toString(); IPath pathBuilderCWD = currentCfgDescription.getBuildSetting().getBuilderCWD();
if (pathBuilderCWD != null) {
String builderCWD = pathBuilderCWD.toString();
try { try {
// TODO - here is a hack to overcome ${workspace_loc:/prj-name} returned by builder // TODO - here is a hack to overcome ${workspace_loc:/prj-name} returned by builder
ICdtVariableManager vmanager = CCorePlugin.getDefault().getCdtVariableManager(); ICdtVariableManager vmanager = CCorePlugin.getDefault().getCdtVariableManager();
@ -462,6 +464,7 @@ public abstract class AbstractLanguageSettingsOutputScanner extends LanguageSett
} }
buildDirURI = org.eclipse.core.filesystem.URIUtil.toURI(builderCWD); buildDirURI = org.eclipse.core.filesystem.URIUtil.toURI(builderCWD);
} }
}
if (buildDirURI == null && currentProject != null) { if (buildDirURI == null && currentProject != null) {
buildDirURI = currentProject.getLocationURI(); buildDirURI = currentProject.getLocationURI();