aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/cmake/fileapi.py
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2019-11-20 18:41:18 +0200
committerGitHub <noreply@github.com>2019-11-20 18:41:18 +0200
commit5920344b9283a55939ef322ca39fdd70f5aafd31 (patch)
tree56a7a59e616f961f6fffc7f359abdf0ef7dc8483 /mesonbuild/cmake/fileapi.py
parent294b33144fbf5628d2a672f907c1f5460577234a (diff)
parent9435f11b17ac428c80ac8af80724aced6c02133a (diff)
downloadmeson-5920344b9283a55939ef322ca39fdd70f5aafd31.zip
meson-5920344b9283a55939ef322ca39fdd70f5aafd31.tar.gz
meson-5920344b9283a55939ef322ca39fdd70f5aafd31.tar.bz2
Merge pull request #6199 from mensinda/cmSysInc
cmake: Handle CMake system include dirs (closes #6079)
Diffstat (limited to 'mesonbuild/cmake/fileapi.py')
-rw-r--r--mesonbuild/cmake/fileapi.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/mesonbuild/cmake/fileapi.py b/mesonbuild/cmake/fileapi.py
index 5ee6ad0..c62eadb 100644
--- a/mesonbuild/cmake/fileapi.py
+++ b/mesonbuild/cmake/fileapi.py
@@ -14,6 +14,7 @@
from .common import CMakeException, CMakeBuildFile, CMakeConfiguration
from typing import Any, List, Tuple
+from .. import mlog
import os
import json
import re
@@ -76,6 +77,7 @@ class CMakeFileAPI:
debug_json = os.path.normpath(os.path.join(self.build_dir, '..', 'fileAPI.json'))
with open(debug_json, 'w') as fp:
json.dump(index, fp, indent=2)
+ mlog.cmd_ci_include(debug_json)
# parse the JSON
for i in index['objects']:
@@ -186,9 +188,7 @@ class CMakeFileAPI:
'language': cg.get('language', 'C'),
'isGenerated': None, # Set later, flag is stored per source file
'sources': [],
-
- # TODO handle isSystem
- 'includePath': [x.get('path', '') for x in cg.get('includes', [])],
+ 'includePath': cg.get('includes', []),
}
normal_src, generated_src, src_idx = parse_sources(cg, tgt)