diff --git a/platform/mbed-trace/CMakeLists.txt b/platform/mbed-trace/CMakeLists.txt
index c65c4e6a5b..2b40b14129 100644
--- a/platform/mbed-trace/CMakeLists.txt
+++ b/platform/mbed-trace/CMakeLists.txt
@@ -1,15 +1,7 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-if(DEFINED TARGET_LIKE_X86_LINUX_NATIVE)
-    add_definitions("-g -O0 -fprofile-arcs -ftest-coverage")
-    # target_link_libraries(mbed-os gcov nanostack-libservice)
-elseif(DEFINED TARGET_LIKE_X86_OSX_NATIVE)
-    add_definitions("-g -O0")
-    # target_link_libraries(mbed-os nanostack-libservice)
-else()
-    # target_link_libraries(mbed-os nanostack-libservice)
-endif()
+add_subdirectory(source)
 
 target_include_directories(mbed-os
     PUBLIC
diff --git a/platform/mbed-trace/source/CMakeLists.txt b/platform/mbed-trace/source/CMakeLists.txt
new file mode 100644
index 0000000000..b5facd3ae4
--- /dev/null
+++ b/platform/mbed-trace/source/CMakeLists.txt
@@ -0,0 +1,18 @@
+if(DEFINED TARGET_LIKE_X86_LINUX_NATIVE)
+    # add_library( mbed-trace
+    #     mbed_trace.c
+    # )
+    add_definitions("-g -O0 -fprofile-arcs -ftest-coverage")
+    # target_link_libraries(mbed-trace gcov nanostack-libservice)
+elseif(DEFINED TARGET_LIKE_X86_OSX_NATIVE)
+    # add_library( mbed-trace
+    #     mbed_trace.c
+    # )
+    add_definitions("-g -O0")
+    # target_link_libraries(mbed-trace nanostack-libservice)
+# else()
+    # add_library( mbed-trace
+    #     mbed_trace.c
+    # )
+    # target_link_libraries(mbed-trace nanostack-libservice)
+endif()