From 335dfddec1cc8d77312814511d156eb1916b7cbf Mon Sep 17 00:00:00 2001 From: Robert Walton Date: Tue, 28 Jul 2020 14:11:34 +0100 Subject: [PATCH] Add tools generated definitions and properties --- cmake/app.cmake | 4 ++++ cmake/util.cmake | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/cmake/app.cmake b/cmake/app.cmake index 78579fcab6..809cb44889 100644 --- a/cmake/app.cmake +++ b/cmake/app.cmake @@ -14,6 +14,10 @@ include(${MBED_ROOT}/cmake/profile.cmake) include(${MBED_ROOT}/cmake/env.cmake) include(${MBED_ROOT}/cmake/util.cmake) +set_target_properties(mbed-os PROPERTIES MBED_TARGET_LABELS "${MBED_TARGET_LABELS}") +target_compile_definitions(mbed-os PUBLIC ${MBED_TARGET_DEFINITIONS}) +target_compile_definitions(mbed-os PUBLIC ${MBED_CONFIG_DEFINITIONS}) + # Specify a default build type if(NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE "RelWithDebInfo" diff --git a/cmake/util.cmake b/cmake/util.cmake index b47afa3638..a6118f0e34 100644 --- a/cmake/util.cmake +++ b/cmake/util.cmake @@ -4,7 +4,7 @@ # PREFIX - TARGET or similar (can be empty string) # KEYWORD_LIST - list of labels that are used to include directories function(mbed_add_cmake_directory_if_labels PREFIX) - get_property(target_labels GLOBAL PROPERTY MBED_TARGET_LABELS) + get_target_property(target_labels mbed-os MBED_TARGET_LABELS) foreach(key ${target_labels}) if(NOT "${PREFIX}" STREQUAL "") string(PREPEND key ${PREFIX} "_")