diff options
| author | Martin Weber | 2020-07-30 18:05:38 +0000 |
|---|---|---|
| committer | Martin Weber | 2020-07-31 17:21:28 +0000 |
| commit | 45c979c400d985b025d52c3a1a08ae11f01dc941 (patch) | |
| tree | 0b42b6b3e5b4a1341ff6c5b0edeac63b0dc66863 /build | |
| parent | a1a3b357ec49a0dd2f729fb5c6a7eb6550ff727e (diff) | |
| download | org.eclipse.cdt-45c979c400d985b025d52c3a1a08ae11f01dc941.tar.gz org.eclipse.cdt-45c979c400d985b025d52c3a1a08ae11f01dc941.tar.xz org.eclipse.cdt-45c979c400d985b025d52c3a1a08ae11f01dc941.zip | |
Bug 565586: Handle -include and -imacros compiler flags
Change-Id: Iee67ab08ed2daa9af69fa1de583f3c6f8305960a
Signed-off-by: Martin Weber <fifteenknots505@gmail.com>
Diffstat (limited to 'build')
| -rw-r--r-- | build/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/CMakeBuildConfiguration.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/build/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/CMakeBuildConfiguration.java b/build/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/CMakeBuildConfiguration.java index 1686b778fbd..90baeba904e 100644 --- a/build/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/CMakeBuildConfiguration.java +++ b/build/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/CMakeBuildConfiguration.java @@ -389,12 +389,13 @@ public class CMakeBuildConfiguration extends CBuildConfiguration { @Override public void acceptSourceFileInfo(String sourceFileName, List<String> systemIncludePaths, - Map<String, String> definedSymbols, List<String> includePaths) { + Map<String, String> definedSymbols, List<String> includePaths, List<String> macroFiles, + List<String> includeFiles) { IFile file = getFileForCMakePath(sourceFileName); if (file != null) { ExtendedScannerInfo info = new ExtendedScannerInfo(definedSymbols, - systemIncludePaths.stream().toArray(String[]::new), null, null, - includePaths.stream().toArray(String[]::new)); + systemIncludePaths.stream().toArray(String[]::new), macroFiles.stream().toArray(String[]::new), + includeFiles.stream().toArray(String[]::new), includePaths.stream().toArray(String[]::new)); infoPerResource.put(file, info); haveUpdates = true; } |