cmake: make ZEPHYR_(INTERFACE_)LIBS target properties

Move them to ZEPHYR_TARGET instead of using globals.

Signed-off-by: Marti Bolivar <[email protected]>

Author: mbolivar-nordic

CMakeLists.txt

@@ -90,6 +90,12 @@ May include mmu tables, etc."
 set_target_properties(${ZEPHYR_TARGET} PROPERTIES GENERATED_KERNEL_OBJECT_FILES "")
 
 
+define_property(TARGET PROPERTY ZEPHYR_INTERFACE_LIBS
+    BRIEF_DOCS "Global list of all Zephyr interface libs that should be linked in."
+    FULL_DOCS  "Global list of all Zephyr interface libs that should be linked in.
+zephyr_interface_library_named() appends libs to this list.")
+set_target_properties(${ZEPHYR_TARGET} PROPERTIES ZEPHYR_INTERFACE_LIBS "")
+
 zephyr_include_directories(
   kernel/include
   ${ARCH_DIR}/${ARCH}/include
@@ -661,7 +667,7 @@ zephyr_get_include_directories_for_lang(C ZEPHYR_INCLUDES)
 add_subdirectory(kernel)
 
 # Read list content
-get_property(ZEPHYR_LIBS_PROPERTY GLOBAL PROPERTY ZEPHYR_LIBS)
+get_target_property(ZEPHYR_LIBS_PROPERTY ${ZEPHYR_TARGET} ZEPHYR_LIBS)
 
 foreach(zephyr_lib ${ZEPHYR_LIBS_PROPERTY})
   # TODO: Could this become an INTERFACE property of zephyr_interface?

cmake/app/boilerplate.cmake

@@ -28,18 +28,6 @@ cmake_policy(SET CMP0002 NEW)
 # CMP0079: "target_link_libraries() allows use with targets in other directories"
 cmake_policy(SET CMP0079 OLD)
 
-define_property(GLOBAL PROPERTY ZEPHYR_LIBS
-    BRIEF_DOCS "Global list of all Zephyr CMake libs that should be linked in"
-    FULL_DOCS  "Global list of all Zephyr CMake libs that should be linked in.
-zephyr_library() appends libs to this list.")
-set_property(GLOBAL PROPERTY ZEPHYR_LIBS "")
-
-define_property(GLOBAL PROPERTY ZEPHYR_INTERFACE_LIBS
-    BRIEF_DOCS "Global list of all Zephyr interface libs that should be linked in."
-    FULL_DOCS  "Global list of all Zephyr interface libs that should be linked in.
-zephyr_interface_library_named() appends libs to this list.")
-set_property(GLOBAL PROPERTY ZEPHYR_INTERFACE_LIBS "")
-
 set(APPLICATION_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR} CACHE PATH "Application Source Directory")
 set(APPLICATION_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR} CACHE PATH "Application Binary Directory")
 
@@ -539,7 +527,7 @@ add_subdirectory(${ZEPHYR_BASE} ${__build_dir})
 # done after 'add_subdirectory(${ZEPHYR_BASE} ${__build_dir})'
 # because interface libraries are defined while processing that
 # subdirectory.
-get_property(ZEPHYR_INTERFACE_LIBS_PROPERTY GLOBAL PROPERTY ZEPHYR_INTERFACE_LIBS)
+get_target_property(ZEPHYR_INTERFACE_LIBS_PROPERTY ${ZEPHYR_TARGET} ZEPHYR_INTERFACE_LIBS)
 foreach(boilerplate_lib ${ZEPHYR_INTERFACE_LIBS_PROPERTY})
   # Linking 'app' with 'boilerplate_lib' causes 'app' to inherit the INTERFACE
   # properties of 'boilerplate_lib'. The most common property is 'include

cmake/extensions.cmake

@@ -441,7 +441,7 @@ endfunction()
 # constructor but must called explicitly on CMake libraries that do
 # not use a zephyr library constructor.
 function(zephyr_append_cmake_library library)
-  set_property(GLOBAL APPEND PROPERTY ZEPHYR_LIBS ${library})
+  set_property(TARGET "${ZEPHYR_TARGET}" APPEND PROPERTY ZEPHYR_LIBS ${library})
 endfunction()
 
 # Add the imported library 'library_name', located at 'library_path' to the
@@ -482,7 +482,7 @@ endfunction()
 # does not have wrappers over the other cmake target functions.
 macro(zephyr_interface_library_named name)
   add_library(${name} INTERFACE)
-  set_property(GLOBAL APPEND PROPERTY ZEPHYR_INTERFACE_LIBS ${name})
+  set_property(TARGET ${ZEPHYR_TARGET} APPEND PROPERTY ZEPHYR_INTERFACE_LIBS ${name})
 endmacro()
 
 # 1.3 generate_inc_*