From da133384b56be588cece7266799fc3e8c22417f8 Mon Sep 17 00:00:00 2001 From: Valerii Koval Date: Wed, 3 May 2023 17:15:55 +0300 Subject: [PATCH] Process internal Arduino libraries in mixed Arduino/IDF projects Resolves #1080 --- builder/frameworks/espidf.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/builder/frameworks/espidf.py b/builder/frameworks/espidf.py index 458f5f9..c55d138 100644 --- a/builder/frameworks/espidf.py +++ b/builder/frameworks/espidf.py @@ -84,7 +84,7 @@ BUILD_DIR = env.subst("$BUILD_DIR") PROJECT_DIR = env.subst("$PROJECT_DIR") PROJECT_SRC_DIR = env.subst("$PROJECT_SRC_DIR") CMAKE_API_REPLY_PATH = os.path.join(".cmake", "api", "v1", "reply") -SDKCONFIG_PATH = os.path.expandvars(board.get( +SDKCONFIG_PATH = os.path.expandvars(board.get( "build.esp-idf.sdkconfig_path", os.path.join(PROJECT_DIR, "sdkconfig.%s" % env.subst("$PIOENV")), )) @@ -1276,6 +1276,10 @@ if "arduino" in env.subst("$PIOFRAMEWORK"): "the `variant` field! The default `esp32` variant will be used." ) extra_components.append(ARDUINO_FRAMEWORK_DIR) + # Add path to internal Arduino libraries so that the LDF will be able to find them + env.Append( + LIBSOURCE_DIRS=[os.path.join(ARDUINO_FRAMEWORK_DIR, "libraries")] + ) print("Reading CMake configuration...") project_codemodel = get_cmake_code_model(