diff --git a/targets/TARGET_TOSHIBA/CMakeLists.txt b/targets/TARGET_TOSHIBA/CMakeLists.txt
index ad409baa4c..482c975202 100644
--- a/targets/TARGET_TOSHIBA/CMakeLists.txt
+++ b/targets/TARGET_TOSHIBA/CMakeLists.txt
@@ -1,13 +1,12 @@
-# Copyright (c) 2020 ARM Limited. All rights reserved.
+# Copyright (c) 2020-2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-if("TMPM46B" IN_LIST MBED_TARGET_LABELS)
-    add_subdirectory(TARGET_TMPM46B)
-elseif("TMPM4G9" IN_LIST MBED_TARGET_LABELS)
-    add_subdirectory(TARGET_TMPM4G9)
-endif()
+add_subdirectory(TARGET_TMPM46B EXCLUDE_FROM_ALL)
+add_subdirectory(TARGET_TMPM4G9 EXCLUDE_FROM_ALL)
 
-target_include_directories(mbed-core
+add_library(mbed-toshiba INTERFACE)
+
+target_include_directories(mbed-toshiba
     INTERFACE
         .
 )
diff --git a/targets/TARGET_TOSHIBA/TARGET_TMPM46B/CMakeLists.txt b/targets/TARGET_TOSHIBA/TARGET_TMPM46B/CMakeLists.txt
index d69a6a784c..09b904c1bb 100644
--- a/targets/TARGET_TOSHIBA/TARGET_TMPM46B/CMakeLists.txt
+++ b/targets/TARGET_TOSHIBA/TARGET_TMPM46B/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 ARM Limited. All rights reserved.
+# Copyright (c) 2020-2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
 if(${MBED_TOOLCHAIN} STREQUAL "ARM")
@@ -9,16 +9,16 @@ elseif(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
     set(STARTUP_FILE device/TOOLCHAIN_GCC_ARM/startup_TMPM46b.S)
 endif()
 
-set_property(GLOBAL PROPERTY MBED_TARGET_LINKER_FILE ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})
+add_library(mbed-tmpm46b INTERFACE)
 
-target_include_directories(mbed-core
+target_include_directories(mbed-tmpm46b
     INTERFACE
         .
         device
         Periph_Driver/inc
 )
 
-target_sources(mbed-core
+target_sources(mbed-tmpm46b
     INTERFACE
         analogin_api.c
         flash_api.c
@@ -52,3 +52,7 @@ target_sources(mbed-core
 
         ${STARTUP_FILE}
 )
+
+mbed_set_linker_script(mbed-tmpm46b ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})
+
+target_link_libraries(mbed-tmpm46b INTERFACE mbed-toshiba)
diff --git a/targets/TARGET_TOSHIBA/TARGET_TMPM4G9/CMakeLists.txt b/targets/TARGET_TOSHIBA/TARGET_TMPM4G9/CMakeLists.txt
index 2222dbcdf7..e4437aa63e 100644
--- a/targets/TARGET_TOSHIBA/TARGET_TMPM4G9/CMakeLists.txt
+++ b/targets/TARGET_TOSHIBA/TARGET_TMPM4G9/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 ARM Limited. All rights reserved.
+# Copyright (c) 2020-2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
 if(${MBED_TOOLCHAIN} STREQUAL "ARM")
@@ -9,16 +9,16 @@ elseif(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
     set(STARTUP_FILE device/TOOLCHAIN_GCC_ARM/startup_TMPM4G9.S)
 endif()
 
-set_property(GLOBAL PROPERTY MBED_TARGET_LINKER_FILE ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})
+add_library(mbed-tmpm4g9 INTERFACE)
 
-target_include_directories(mbed-core
+target_include_directories(mbed-tmpm4g9
     INTERFACE
         .
         device
         Periph_Driver/inc
 )
 
-target_sources(mbed-core
+target_sources(mbed-tmpm4g9
     INTERFACE
         analogin_api.c
         analogout_api.c
@@ -54,3 +54,7 @@ target_sources(mbed-core
 
         ${STARTUP_FILE}
 )
+
+mbed_set_linker_script(mbed-tmpm4g9 ${CMAKE_CURRENT_SOURCE_DIR}/${LINKER_FILE})
+
+target_link_libraries(mbed-tmpm4g9 INTERFACE mbed-toshiba)