Merge branch 'bugfix/idf_as_lib_not_in_top_level' into 'master'

projectgus · projectgus · commit 7270c921be97 · 2020-06-04T16:51:55.000+08:00
CMake: Fix issue when `idf_build_process` is called from a subdirectory

Closes IDF-1651

See merge request espressif/esp-idf!8722
diff --git a/tools/cmake/build.cmake b/tools/cmake/build.cmake
@@ -1,4 +1,3 @@
-
 # idf_build_get_property
 #
 # @brief Retrieve the value of the specified property related to ESP-IDF build.
@@ -126,8 +125,9 @@ endfunction()
 # properties used for the processing phase of the build.
 #
 function(__build_init idf_path)
-    # Create the build target, to which the ESP-IDF build properties, dependencies are attached to
-    add_library(__idf_build_target STATIC IMPORTED)
+    # Create the build target, to which the ESP-IDF build properties, dependencies are attached to.
+    # Must be global so as to be accessible from any subdirectory in custom projects.
+    add_library(__idf_build_target STATIC IMPORTED GLOBAL)
 
     set_default(python "python")
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-`
`2`	`1`	`# idf_build_get_property`
`3`	`2`	`#`
`4`	`3`	`# @brief Retrieve the value of the specified property related to ESP-IDF build.`
`@@ -126,8 +125,9 @@ endfunction()`
`126`	`125`	`# properties used for the processing phase of the build.`
`127`	`126`	`#`
`128`	`127`	`function(__build_init idf_path)`
`129`		`- # Create the build target, to which the ESP-IDF build properties, dependencies are attached to`
`130`		`- add_library(__idf_build_target STATIC IMPORTED)`
	`128`	`+ # Create the build target, to which the ESP-IDF build properties, dependencies are attached to.`
	`129`	`+ # Must be global so as to be accessible from any subdirectory in custom projects.`
	`130`	`+ add_library(__idf_build_target STATIC IMPORTED GLOBAL)`
`131`	`131`
`132`	`132`	`set_default(python "python")`
`133`	`133`