From 9b8c5acb99df266918741ba4ae6d978ddff2215a Mon Sep 17 00:00:00 2001 From: Hugues Kamba Date: Mon, 7 Sep 2020 21:41:13 +0100 Subject: [PATCH] CMake: Fix build failure due to mbed-trace, mbed-client-randlib, and nanostack dir changes --- .../source/libDHCPv6/CMakeLists.txt | 1 + .../source/libNET/CMakeLists.txt | 3 +++ features/CMakeLists.txt | 2 -- .../mbed-client-randlib/CMakeLists.txt | 12 ---------- platform/CMakeLists.txt | 2 ++ platform/mbed-trace/CMakeLists.txt | 22 ++++++++++++++----- platform/mbed-trace/source/CMakeLists.txt | 18 --------------- platform/randlib/CMakeLists.txt | 14 ++++++++++++ 8 files changed, 36 insertions(+), 38 deletions(-) delete mode 100644 features/frameworks/mbed-client-randlib/CMakeLists.txt delete mode 100644 platform/mbed-trace/source/CMakeLists.txt create mode 100644 platform/randlib/CMakeLists.txt diff --git a/connectivity/nanostack/sal-stack-nanostack/source/libDHCPv6/CMakeLists.txt b/connectivity/nanostack/sal-stack-nanostack/source/libDHCPv6/CMakeLists.txt index a51a5f1c19..e2523c0375 100644 --- a/connectivity/nanostack/sal-stack-nanostack/source/libDHCPv6/CMakeLists.txt +++ b/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 ) diff --git a/connectivity/nanostack/sal-stack-nanostack/source/libNET/CMakeLists.txt b/connectivity/nanostack/sal-stack-nanostack/source/libNET/CMakeLists.txt index f2116ff540..49927979f4 100644 --- a/connectivity/nanostack/sal-stack-nanostack/source/libNET/CMakeLists.txt +++ b/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 diff --git a/features/CMakeLists.txt b/features/CMakeLists.txt index c1782e04c0..33aeb0ae05 100644 --- a/features/CMakeLists.txt +++ b/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 diff --git a/features/frameworks/mbed-client-randlib/CMakeLists.txt b/features/frameworks/mbed-client-randlib/CMakeLists.txt deleted file mode 100644 index 1646a67637..0000000000 --- a/features/frameworks/mbed-client-randlib/CMakeLists.txt +++ /dev/null @@ -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 -) diff --git a/platform/CMakeLists.txt b/platform/CMakeLists.txt index 8a6d8cb27d..f8e5eea3ed 100644 --- a/platform/CMakeLists.txt +++ b/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) diff --git a/platform/mbed-trace/CMakeLists.txt b/platform/mbed-trace/CMakeLists.txt index 37753212e9..c65c4e6a5b 100644 --- a/platform/mbed-trace/CMakeLists.txt +++ b/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 ) diff --git a/platform/mbed-trace/source/CMakeLists.txt b/platform/mbed-trace/source/CMakeLists.txt deleted file mode 100644 index 7e7a0a08f4..0000000000 --- a/platform/mbed-trace/source/CMakeLists.txt +++ /dev/null @@ -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() diff --git a/platform/randlib/CMakeLists.txt b/platform/randlib/CMakeLists.txt new file mode 100644 index 0000000000..3d5408cc20 --- /dev/null +++ b/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 +)