CMake: Fix build failure due to mbed-trace, mbed-client-randlib, and nanostack dir changes

connectivity/nanostack/sal-stack-nanostack/source/libDHCPv6/CMakeLists.txt

@@ -11,4 +11,5 @@ target_sources(mbed-os
         dhcp_service_api.c
         libDHCPv6.c
         libDHCPv6_server.c
+        libDHCPv6_vendordata.c
 )

connectivity/nanostack/sal-stack-nanostack/source/libNET/CMakeLists.txt

@@ -11,8 +11,11 @@ target_sources(mbed-os
     PRIVATE
         src/multicast_api.c
         src/net_6lowpan_parameter_api.c
+        src/net_dns.c
+        src/net_dns_internal.h
         src/net_ipv6.c
         src/net_load_balance.c
+        src/net_load_balance_internal.h
         src/net_mle.c
         src/net_rpl.c
         src/net_short_address_extension.c

features/CMakeLists.txt

@@ -3,8 +3,6 @@
 
 mbed_add_cmake_directory_if_labels("FEATURE")
 
-add_subdirectory(frameworks/mbed-client-randlib)
-add_subdirectory(frameworks/mbed-trace)
 add_subdirectory(frameworks/mbed-client-cli)
 
 target_include_directories(mbed-os

features/frameworks/mbed-client-randlib/CMakeLists.txt

@@ -1,12 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-
-target_sources(mbed-os
-    PRIVATE
-        source/randLIB.c
-)
-
-target_include_directories(mbed-os
-    PUBLIC
-        mbed-client-randlib
-        mbed-client-randlib/platform
-)

platform/CMakeLists.txt

@@ -4,6 +4,8 @@
 mbed_add_cmake_directory_if_labels("FEATURE")
 
 add_subdirectory(cxxsupport)
+add_subdirectory(mbed-trace)
+add_subdirectory(randlib)
 add_subdirectory(source/TARGET_CORTEX_M)
 add_subdirectory(source/minimal-printf)
 

platform/mbed-trace/CMakeLists.txt

@@ -1,13 +1,23 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-target_sources(mbed-os
-    PRIVATE
-        ource/mbed_trace.c
-)
+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()
 
 target_include_directories(mbed-os
     PUBLIC
-        ${CMAKE_CURRENT_SOURCE_DIR}
-        ${CMAKE_CURRENT_SOURCE_DIR}/mbed-trace
+        include
+        include/mbed-trace
+)
+
+target_sources(mbed-os
+    PRIVATE
+        source/mbed_trace.c
 )

platform/mbed-trace/source/CMakeLists.txt

@@ -1,18 +0,0 @@
-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()

platform/randlib/CMakeLists.txt

@@ -0,0 +1,14 @@
+# Copyright (c) 2020 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+target_include_directories(mbed-os
+    PUBLIC
+        include
+        include/mbed-client-randlib
+        include/mbed-client-randlib/platform
+)
+
+target_sources(mbed-os
+    PRIVATE
+        source/randLIB.c
+)