platformio/platformio-core
1
0
Fork 1
mirror of https://github.com/platformio/platformio-core.git synced 2025-07-30 01:57:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

LDF: Check global CPPPATH when looking for dependencies

Browse Source
This commit is contained in:
Ivan Kravets
2019-10-23 22:31:26 +03:00
parent 95d1f43799
commit b533d7a1dd
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
platformio/builder/tools/piolib.py
View File

@ -304,7 +304,10 @@ class LibBuilderBase(object):
): ):
# all include directories # all include directories
if not LibBuilderBase._INCLUDE_DIRS_CACHE: if not LibBuilderBase._INCLUDE_DIRS_CACHE:
LibBuilderBase._INCLUDE_DIRS_CACHE = [] LibBuilderBase._INCLUDE_DIRS_CACHE = [
self.env.Dir(os.path.realpath(d) if os.path.isdir(d) else d)
for d in self.envorigin.get("CPPPATH", [])
]
for lb in self.env.GetLibBuilders(): for lb in self.env.GetLibBuilders():
LibBuilderBase._INCLUDE_DIRS_CACHE.extend( LibBuilderBase._INCLUDE_DIRS_CACHE.extend(
[self.env.Dir(d) for d in lb.get_include_dirs()] [self.env.Dir(d) for d in lb.get_include_dirs()]
@ -346,7 +349,7 @@ class LibBuilderBase(object):
self.env.File(path), self.env, tuple(include_dirs) self.env.File(path), self.env, tuple(include_dirs)
) )
# print(path, map(lambda n: n.get_abspath(), candidates)) # print(path, [c.get_abspath() for c in candidates])
for item in candidates: for item in candidates:
if item not in result: if item not in result:
result.append(item) result.append(item)