Change to create only one of mbed-os/mbed-baremteal

Dependent on target config option application-profile, this changes
to create only one of distributed cmake library targets mbed-os/
mbed-baremteal, not both. This is to guard from mismatch of application
profile selection (target config option application-profile and link of
mbed-os/mbed-baremetal).

Author: ccli8

CMakeLists.txt

@@ -289,8 +289,11 @@ if(NOT MBED_IS_NATIVE_BUILD)
     # mbed-os will be a superset of mbed-baremetal, also containing the RTOS sources and RTOS flags.
     # Note that many different source files will compile differently depending on if the RTOS is in use.
     # So, it's needed to compile the core sources twice, once for RTOS and once for non-RTOS.
-    mbed_create_distro(mbed-baremetal ${MBED_TARGET_CMAKE_NAME} mbed-core-flags mbed-core-sources)
-    mbed_create_distro(mbed-os ${MBED_TARGET_CMAKE_NAME} mbed-core-flags mbed-core-sources mbed-rtos-flags mbed-rtos-sources)
+    if("MBED_CONF_TARGET_APPLICATION_PROFILE=bare-metal" IN_LIST MBED_CONFIG_DEFINITIONS)
+        mbed_create_distro(mbed-baremetal ${MBED_TARGET_CMAKE_NAME} mbed-core-flags mbed-core-sources)
+    elseif("MBED_CONF_TARGET_APPLICATION_PROFILE=full" IN_LIST MBED_CONFIG_DEFINITIONS)
+        mbed_create_distro(mbed-os ${MBED_TARGET_CMAKE_NAME} mbed-core-flags mbed-core-sources mbed-rtos-flags mbed-rtos-sources)
+    endif()
 
     # Set up the linker script and hook it up to the top-level OS targets
     mbed_setup_linker_script(mbed-os mbed-baremetal ${CMAKE_CURRENT_BINARY_DIR}/generated-headers/mbed-target-config.h)

tools/cmake/mbed_set_linker_script.cmake

@@ -28,14 +28,20 @@ endfunction(mbed_set_linker_script)
 function(mbed_setup_linker_script mbed_os_target mbed_baremetal_target target_defines_header)
 
     # Find the path to the desired linker script
-    # (the property should be set on both the OS and baremetal targets in a sane world)
-    get_property(RAW_LINKER_SCRIPT_PATHS_SET TARGET ${mbed_baremetal_target} PROPERTY INTERFACE_MBED_LINKER_SCRIPT SET)
-    if(NOT RAW_LINKER_SCRIPT_PATHS_SET)
-        message(FATAL_ERROR "No linker script has been set for the Mbed target. Ensure that code is calling mbed_set_linker_script() for the mbed-<your-board-name> target or one of its parents")
+    if(TARGET ${mbed_os_target})
+        get_property(RAW_LINKER_SCRIPT_PATHS_SET TARGET ${mbed_os_target} PROPERTY INTERFACE_MBED_LINKER_SCRIPT SET)
+        if(NOT RAW_LINKER_SCRIPT_PATHS_SET)
+            message(FATAL_ERROR "No linker script has been set for the Mbed target. Ensure that code is calling mbed_set_linker_script() for the mbed-<your-board-name> target or one of its parents")
+        endif()
+        get_property(RAW_LINKER_SCRIPT_PATHS TARGET ${mbed_os_target} PROPERTY INTERFACE_MBED_LINKER_SCRIPT)
+    elseif (TARGET ${mbed_baremetal_target})
+        get_property(RAW_LINKER_SCRIPT_PATHS_SET TARGET ${mbed_baremetal_target} PROPERTY INTERFACE_MBED_LINKER_SCRIPT SET)
+        if(NOT RAW_LINKER_SCRIPT_PATHS_SET)
+            message(FATAL_ERROR "No linker script has been set for the Mbed target. Ensure that code is calling mbed_set_linker_script() for the mbed-<your-board-name> target or one of its parents")
+        endif()
+        get_property(RAW_LINKER_SCRIPT_PATHS TARGET ${mbed_baremetal_target} PROPERTY INTERFACE_MBED_LINKER_SCRIPT)
     endif()
 
-    get_property(RAW_LINKER_SCRIPT_PATHS TARGET ${mbed_baremetal_target} PROPERTY INTERFACE_MBED_LINKER_SCRIPT)
-
     # Check if two (or more) different linker scripts got used
     list(REMOVE_DUPLICATES RAW_LINKER_SCRIPT_PATHS)
     list(LENGTH RAW_LINKER_SCRIPT_PATHS NUM_RAW_LINKER_SCRIPT_PATHS)
@@ -83,6 +89,10 @@ function(mbed_setup_linker_script mbed_os_target mbed_baremetal_target target_de
     # by the time we need it.
     add_custom_target(mbed-linker-script DEPENDS ${LINKER_SCRIPT_PATH} VERBATIM)
     foreach(TARGET ${mbed_baremetal_target} ${mbed_os_target})
+        if(NOT TARGET ${TARGET})
+            continue()
+        endif()
+
         add_dependencies(${TARGET} mbed-linker-script)
 
         # When building the Mbed internal tests, the tests get created before the mbed-os target does.  So, the normal logic 

tools/cmake/mbed_target_functions.cmake

@@ -137,8 +137,14 @@ function(mbed_set_post_build target)
         if("${ARGN}" STREQUAL "")
             get_target_property(POST_BUILD_TARGET_LINK_LIBRARIES ${target} LINK_LIBRARIES)
             if("mbed-os" IN_LIST POST_BUILD_TARGET_LINK_LIBRARIES)
+                if(NOT TARGET mbed-os)
+                    message(FATAL_ERROR "Link target \"mbed-os\" doesn't match target config option \"target.application-profile\"")
+                endif()
                 get_target_property(LINKER_SCRIPT_PATH mbed-os LINKER_SCRIPT_PATH)
             elseif("mbed-baremetal" IN_LIST POST_BUILD_TARGET_LINK_LIBRARIES)
+                if(NOT TARGET mbed-baremetal)
+                    message(FATAL_ERROR "Link target \"mbed-baremetal\" doesn't match target config option \"target.application-profile\"")
+                endif()
                 get_target_property(LINKER_SCRIPT_PATH mbed-baremetal LINKER_SCRIPT_PATH)
             else()
                 message(FATAL_ERROR "Target ${target} used with mbed_set_post_build() but does not link to mbed-os or mbed-baremetal!")