From 6eb4bb16ec5f99c45524508f2e52506a66bd89b5 Mon Sep 17 00:00:00 2001 From: redengin Date: Mon, 25 May 2020 01:34:54 -0700 Subject: [PATCH 1/2] allow unit test of extra-components Merges https://github.com/espressif/esp-idf/pull/5345 --- tools/unit-test-app/CMakeLists.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/unit-test-app/CMakeLists.txt b/tools/unit-test-app/CMakeLists.txt index 50e000d5e..219875afe 100644 --- a/tools/unit-test-app/CMakeLists.txt +++ b/tools/unit-test-app/CMakeLists.txt @@ -2,8 +2,10 @@ # CMakeLists in this exact order for cmake to work correctly cmake_minimum_required(VERSION 3.5) -set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/examples/cxx/experimental/experimental_cpp_component/" - "$ENV{IDF_PATH}/examples/peripherals/rmt/ir_protocols/components") +set(EXTRA_COMPONENT_DIRS + ${EXTRA_COMPONENT_DIRS} + "$ENV{IDF_PATH}/examples/cxx/experimental/experimental_cpp_component/" + "$ENV{IDF_PATH}/examples/peripherals/rmt/ir_protocols/components") include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(unit-test-app) From 50b93ce130d290e5abe94268ea2f1ba25f10f98c Mon Sep 17 00:00:00 2001 From: morris Date: Tue, 26 May 2020 12:44:05 +0800 Subject: [PATCH 2/2] fix uninitialized variable EXTRA_COMPONENT_DIRS --- tools/unit-test-app/CMakeLists.txt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tools/unit-test-app/CMakeLists.txt b/tools/unit-test-app/CMakeLists.txt index 219875afe..24351c17b 100644 --- a/tools/unit-test-app/CMakeLists.txt +++ b/tools/unit-test-app/CMakeLists.txt @@ -2,10 +2,8 @@ # CMakeLists in this exact order for cmake to work correctly cmake_minimum_required(VERSION 3.5) -set(EXTRA_COMPONENT_DIRS - ${EXTRA_COMPONENT_DIRS} - "$ENV{IDF_PATH}/examples/cxx/experimental/experimental_cpp_component/" - "$ENV{IDF_PATH}/examples/peripherals/rmt/ir_protocols/components") +list(APPEND EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/examples/cxx/experimental/experimental_cpp_component/" + "$ENV{IDF_PATH}/examples/peripherals/rmt/ir_protocols/components") include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(unit-test-app)