Ver Fonte

Merge branch 'bugfix/cmake_soc_test' into 'master'

soc: fix compiling unit tests with CMake

Closes IDF-499

See merge request idf/esp-idf!4545
Ivan Grokhotkov há 7 anos atrás
pai
commit
6d4a7b1a7e
1 ficheiros alterados com 7 adições e 6 exclusões
  1. 7 6
      components/soc/test/CMakeLists.txt

+ 7 - 6
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(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)
+set(COMPONENT_REQUIRES unity test_utils)
 
-    register_component()
-endif()
+register_component()