Upstream/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-12-21 16:27:44 +01:00
Code Issues Projects Releases Wiki Activity

Set correct include_dir in platformio.ini (#2999)

Browse Source
This commit is contained in:
Oxan van Leeuwen 2022-01-04 21:59:34 +01:00 committed by GitHub
parent 193d3e0206
commit ffea3597f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
platformio.ini
View File

@ -5,8 +5,13 @@
[platformio] [platformio]
default_envs = esp8266, esp32, esp32-idf default_envs = esp8266, esp32, esp32-idf
; Ideally, we want src_dir to be the root directory of the repository, to mimic the runtime build
; environment as best as possible. Unfortunately, the ESP-IDF toolchain really doesn't like this
; being the root directory. Instead, set esphome/ as the source directory, all our sources are in
; there anyway. Set the root directory as the include_dir, so that the esphome/ directory is on the
; include path.
src_dir = esphome src_dir = esphome
include_dir = include_dir = .
[runtime] [runtime]
; This are the flags as set by the runtime. ; This are the flags as set by the runtime.

14
script/clang-tidy
View File

@ -1,7 +1,7 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
from helpers import print_error_for_file, get_output, filter_grep, \ from helpers import print_error_for_file, get_output, filter_grep, \
build_all_include, temp_header_file, git_ls_files, filter_changed, load_idedata, basepath build_all_include, temp_header_file, git_ls_files, filter_changed, load_idedata, root_path, basepath
import argparse import argparse
import click import click
import colorama import colorama
@ -58,17 +58,21 @@ def clang_options(idedata):
# defines # defines
cmd.extend(f'-D{define}' for define in idedata['defines']) cmd.extend(f'-D{define}' for define in idedata['defines'])
# add toolchain include directories using -isystem # add toolchain include directories using -isystem to suppress their errors
# idedata contains include directories for all toolchains of this platform, only use those from the one in use # idedata contains include directories for all toolchains of this platform, only use those from the one in use
toolchain_dir = os.path.normpath(f"{idedata['cxx_path']}/../../") toolchain_dir = os.path.normpath(f"{idedata['cxx_path']}/../../")
for directory in idedata['includes']['toolchain']: for directory in idedata['includes']['toolchain']:
if directory.startswith(toolchain_dir): if directory.startswith(toolchain_dir):
cmd.extend(['-isystem', directory]) cmd.extend(['-isystem', directory])
# add include directories, using -isystem for dependencies to suppress their errors # add library include directories using -isystem to suppress their errors
for directory in sorted(set(idedata['includes']['build'])): for directory in sorted(set(idedata['includes']['build'])):
dependency = "framework-arduino" in directory or "/libdeps/" in directory # skip our own directories, we add those later
cmd.extend(['-isystem' if dependency else '-I', directory]) if not directory.startswith(f"{root_path}/") or directory.startswith(f"{root_path}/.pio/"):
cmd.extend(['-isystem', directory])
# add the esphome include directory using -I
cmd.extend(['-I', root_path])
return cmd return cmd