From ecd176c5742d3e5b1bc444f9182d3da7fc776579 Mon Sep 17 00:00:00 2001 From: Niklas Hauser Date: Sun, 4 Apr 2021 21:31:28 +0200 Subject: [PATCH] [build] Fix missing local include path --- tools/build_script_generator/make/resources/config.mk.in | 1 + tools/build_script_generator/scons/resources/SConstruct.in | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/build_script_generator/make/resources/config.mk.in b/tools/build_script_generator/make/resources/config.mk.in index 3da36a6f4d..6e91cbe065 100644 --- a/tools/build_script_generator/make/resources/config.mk.in +++ b/tools/build_script_generator/make/resources/config.mk.in @@ -57,6 +57,7 @@ APP_SRC := $(APP_SRC:./%=%) %% for repo in generated_paths APP_SRC := $(filter-out {{repo}}/%,$(APP_SRC)) %% endfor +CPPDEFINES += -I. %% if options["::info.git"] != "Disabled" %# # Git information diff --git a/tools/build_script_generator/scons/resources/SConstruct.in b/tools/build_script_generator/scons/resources/SConstruct.in index 93b9ea4589..d6af31feda 100644 --- a/tools/build_script_generator/scons/resources/SConstruct.in +++ b/tools/build_script_generator/scons/resources/SConstruct.in @@ -29,7 +29,7 @@ env.Alias("library", libraries) headers = env.FindHeaderFiles("{{ unittest_source }}") sources = [env.UnittestRunner(target="unittest_runner.cpp", source=headers)] %% else -env.Append(CPPPATH=".") +env.Append(CPPPATH=abspath(".")) ignored = [".lbuild_cache", env["CONFIG_BUILD_BASE"]] + generated_paths sources = [] %% endif