Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Weber2020-11-30 20:11:00 +0000
committerMartin Weber2020-12-01 19:10:32 +0000
commit725ff665e781762925ef89d3f6f74315eccbbf3d (patch)
treeee5fc4149c643a7be9f9f135a87c802964abd154
parent1d0bc6992f27e17d1c7bcb933e482672377c9808 (diff)
downloadorg.eclipse.cdt-725ff665e781762925ef89d3f6f74315eccbbf3d.tar.gz
org.eclipse.cdt-725ff665e781762925ef89d3f6f74315eccbbf3d.tar.xz
org.eclipse.cdt-725ff665e781762925ef89d3f6f74315eccbbf3d.zip
Bug 569186: Fix: Project rebuild is causing Unresolved inclusion issues
Change-Id: I9c59c6a8b5963edac7d33a35b936a161ce9eb337 Signed-off-by: Martin Weber <fifteenknots505@gmail.com>
-rw-r--r--cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/CMakeBuildConfiguration.java4
1 files changed, 1 insertions, 3 deletions
diff --git a/cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/CMakeBuildConfiguration.java b/cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/CMakeBuildConfiguration.java
index 66453b8bc39..4cf4b2ff29d 100644
--- a/cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/CMakeBuildConfiguration.java
+++ b/cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/CMakeBuildConfiguration.java
@@ -131,7 +131,6 @@ public class CMakeBuildConfiguration extends CBuildConfiguration {
IProject project = getProject();
project.deleteMarkers(ICModelMarker.C_MODEL_PROBLEM_MARKER, false, IResource.DEPTH_INFINITE);
- infoPerResource = new HashMap<>();
try {
@@ -357,14 +356,13 @@ public class CMakeBuildConfiguration extends CBuildConfiguration {
public IScannerInfo getScannerInformation(IResource resource) {
if (infoPerResource == null) {
// no build was run yet, nothing detected
- infoPerResource = new HashMap<>();
try {
processCompileCommandsFile(null, new NullProgressMonitor());
} catch (CoreException e) {
Activator.log(e);
}
}
- return infoPerResource.get(resource);
+ return infoPerResource == null ? null : infoPerResource.get(resource);
}
private void setScannerInformation(Map<IResource, IScannerInfo> infoPerResource) {

Back to the top