From 73851e0b5c9643beca26ce8deaa94347cdb6b93b Mon Sep 17 00:00:00 2001 From: Ivan Grokhotkov Date: Tue, 19 Mar 2019 11:42:51 +0800 Subject: [PATCH] soc: fix compiling unit tests with CMake soc unit tests have not been included when compiling with CMake, because ../${SOC_NAME}/test was not evaluated relative to the CMakeLists.txt directory. Also call register_components() regardless of the presence of test directory for particular target. --- components/soc/test/CMakeLists.txt | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/components/soc/test/CMakeLists.txt b/components/soc/test/CMakeLists.txt index 461e7fee6..b70b4b5fd 100644 --- a/components/soc/test/CMakeLists.txt +++ b/components/soc/test/CMakeLists.txt @@ -1,9 +1,10 @@ set(SOC_NAME ${IDF_TARGET}) -if(EXISTS "../${SOC_NAME}/test") - set(COMPONENT_SRCDIRS "../${SOC_NAME}/test") - set(COMPONENT_ADD_INCLUDEDIRS "../${SOC_NAME}/test") - - set(COMPONENT_REQUIRES unity test_utils) - - register_component() +set(SOC_TEST_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../${SOC_NAME}/test) +if(EXISTS "${SOC_TEST_DIR}") + set(COMPONENT_SRCDIRS "${SOC_TEST_DIR}") + set(COMPONENT_ADD_INCLUDEDIRS "${SOC_TEST_DIR}") endif() + +set(COMPONENT_REQUIRES unity test_utils) + +register_component()