Make all libraries link mbed-application-profile-flags

This makes all libraries link mbed-application-profile-flags instead of mbed-core-flags/mbed-rtos-flags so that they build on correct application profile, mbed-os or mbed-baremetal.
mbed-ce · Dec 31, 2024 · 5feb822 · 5feb822
1 parent 053bcf4
commit 5feb822
Show file tree

Hide file tree

Showing 26 changed files with 29 additions and 37 deletions.
diff --git a/connectivity/cellular/CMakeLists.txt b/connectivity/cellular/CMakeLists.txt
@@ -38,7 +38,6 @@ target_sources(mbed-cellular
 target_link_libraries(mbed-cellular
     PUBLIC
         mbed-netsocket-api
-        mbed-core-flags
-        mbed-rtos-flags
+        mbed-application-profile-flags
         mbed-randlib
 )
diff --git a/connectivity/drivers/802.15.4_RF/CMakeLists.txt b/connectivity/drivers/802.15.4_RF/CMakeLists.txt
@@ -7,7 +7,7 @@ macro(create_mbed_802_15_4_target)
 		add_library(mbed-802.15.4-rf STATIC EXCLUDE_FROM_ALL)
 
 		# Nanostack drivers always require Mbed RTOS
-		target_link_libraries(mbed-802.15.4-rf PUBLIC mbed-core-flags mbed-rtos-flags)
+		target_link_libraries(mbed-802.15.4-rf PUBLIC mbed-application-profile-flags)
 
 		# For NanostackRfPhy.h
 		target_link_libraries(mbed-802.15.4-rf PUBLIC mbed-nanostack)

diff --git a/connectivity/drivers/ble/FEATURE_BLE/COMPONENT_BlueNRG_2/CMakeLists.txt b/connectivity/drivers/ble/FEATURE_BLE/COMPONENT_BlueNRG_2/CMakeLists.txt
@@ -6,10 +6,9 @@ add_library(mbed-bluenrg2 STATIC EXCLUDE_FROM_ALL
 
 target_link_libraries(mbed-bluenrg2 
     PUBLIC
-        mbed-core-flags
+        mbed-application-profile-flags
         mbed-ble
-    PRIVATE
-        mbed-rtos-flags)
+)
 
 # circular dependency between mbed-ble and the BlueNRG driver, because of the ble_cordio_get_hci_driver() implementation
 target_link_libraries(mbed-ble PUBLIC mbed-bluenrg2)
diff --git a/connectivity/drivers/ble/FEATURE_BLE/COMPONENT_BlueNRG_MS/CMakeLists.txt b/connectivity/drivers/ble/FEATURE_BLE/COMPONENT_BlueNRG_MS/CMakeLists.txt
@@ -6,10 +6,9 @@ add_library(mbed-bluenrg-ms STATIC EXCLUDE_FROM_ALL
 
 target_link_libraries(mbed-bluenrg-ms
     PUBLIC
-        mbed-core-flags
+        mbed-application-profile-flags
         mbed-ble
-    PRIVATE
-        mbed-rtos-flags)
+)
 
 
 # circular dependency between mbed-ble and the BlueNRG driver, because of the ble_cordio_get_hci_driver() implementation

diff --git a/connectivity/drivers/emac/CMakeLists.txt b/connectivity/drivers/emac/CMakeLists.txt
@@ -33,5 +33,5 @@ target_link_libraries(mbed-emac
     PUBLIC
         mbed-netsocket-api
     PRIVATE
-        mbed-rtos-flags
+        mbed-application-profile-flags
 )
diff --git a/connectivity/drivers/wifi/CMakeLists.txt b/connectivity/drivers/wifi/CMakeLists.txt
@@ -8,7 +8,7 @@ macro(create_mbed_wifi_target)
 
 		target_link_libraries(mbed-wifi
 		    PUBLIC
-		        mbed-rtos-flags
+		        mbed-application-profile-flags
 		        mbed-netsocket-api
 		)
 	endif()

diff --git a/connectivity/drivers/wifi/COMPONENT_WHD/minimal-cyhal/CMakeLists.txt b/connectivity/drivers/wifi/COMPONENT_WHD/minimal-cyhal/CMakeLists.txt
@@ -15,7 +15,7 @@ add_library(mbed-minimal-cyhal STATIC
 	wiced_filesystem.cpp)
 target_include_directories(mbed-minimal-cyhal PUBLIC .)
 target_link_libraries(mbed-minimal-cyhal PUBLIC
-	mbed-core-flags
+	mbed-application-profile-flags
 	mbed-cy-rtos-abstraction)
 
 # This is needed in order to make cybsp_wifi.h include cycfg.h

diff --git a/connectivity/drivers/wifi/COMPONENT_WHD/whd-bsp-integration/CMakeLists.txt b/connectivity/drivers/wifi/COMPONENT_WHD/whd-bsp-integration/CMakeLists.txt
@@ -15,7 +15,7 @@ target_sources(mbed-wifi
 target_link_libraries(mbed-wifi
     PUBLIC
         mbed-lwipstack
-		mbed-rtos-flags
+		mbed-application-profile-flags
 )
 
 if("DEVICE_EMAC=1" IN_LIST MBED_TARGET_DEFINITIONS)

diff --git a/connectivity/libraries/mbed-coap/CMakeLists.txt b/connectivity/libraries/mbed-coap/CMakeLists.txt
@@ -26,6 +26,6 @@ target_compile_definitions(mbed-coap
 target_link_libraries(mbed-coap
     PUBLIC
         mbed-nanostack-libservice
-        mbed-core-flags
+        mbed-application-profile-flags
         mbed-randlib
 )
diff --git a/connectivity/libraries/ppp/CMakeLists.txt b/connectivity/libraries/ppp/CMakeLists.txt
@@ -57,5 +57,5 @@ target_link_libraries(mbed-ppp
     PUBLIC
         mbed-netsocket-api
     PRIVATE
-        mbed-rtos-flags
+        mbed-application-profile-flags
 )
diff --git a/connectivity/lwipstack/CMakeLists.txt b/connectivity/lwipstack/CMakeLists.txt
@@ -100,6 +100,6 @@ target_link_libraries(mbed-lwipstack
         mbed-ppp
         mbed-randlib
     PRIVATE
-        mbed-rtos-flags
+        mbed-application-profile-flags
 )
 
diff --git a/connectivity/mbedtls/CMakeLists.txt b/connectivity/mbedtls/CMakeLists.txt
@@ -115,7 +115,7 @@ target_compile_definitions(mbed-mbedtls
         MBED_CONF_MBEDTLS_PRESENT=1
 )
 
-target_link_libraries(mbed-mbedtls PUBLIC mbed-core-flags)
+target_link_libraries(mbed-mbedtls PUBLIC mbed-application-profile-flags)
 
 # Link Mbed's PSA implementation on enabled
 if(("FEATURE_EXPERIMENTAL_API=1" IN_LIST MBED_TARGET_DEFINITIONS) AND

diff --git a/connectivity/nanostack/mbed-mesh-api/CMakeLists.txt b/connectivity/nanostack/mbed-mesh-api/CMakeLists.txt
@@ -36,9 +36,7 @@ target_link_libraries(mbed-nanostack-mbed_mesh_api
         mbed-nanostack-sal_stack
 		mbed-nanostack
         mbed-netsocket-api
-        mbed-core-flags
-    PRIVATE
-        mbed-rtos-flags
+        mbed-application-profile-flags
 )
 
 # Since there are a lot of circular references between this library and mbed-netsocket-api,

diff --git a/connectivity/nanostack/nanostack-hal-mbed-cmsis-rtos/CMakeLists.txt b/connectivity/nanostack/nanostack-hal-mbed-cmsis-rtos/CMakeLists.txt
@@ -24,11 +24,9 @@ target_sources(mbed-nanostack-hal_mbed_cmsis_rtos
 
 target_link_libraries(mbed-nanostack-hal_mbed_cmsis_rtos
     PUBLIC
-        mbed-core-flags
+        mbed-application-profile-flags
         mbed-randlib
         mbed-nanostack-sal_stack-event_loop
         mbed-nanostack-libservice
         mbed-nanostack-sal_stack
-    PRIVATE
-        mbed-rtos-flags
 )
diff --git a/connectivity/nanostack/sal-stack-nanostack-eventloop/CMakeLists.txt b/connectivity/nanostack/sal-stack-nanostack-eventloop/CMakeLists.txt
@@ -20,5 +20,5 @@ target_sources(mbed-nanostack-sal_stack-event_loop
 
 target_link_libraries(mbed-nanostack-sal_stack-event_loop
     PUBLIC
-        mbed-core-flags
+        mbed-application-profile-flags
 )
diff --git a/connectivity/nanostack/sal-stack-nanostack/CMakeLists.txt b/connectivity/nanostack/sal-stack-nanostack/CMakeLists.txt
@@ -32,7 +32,7 @@ target_include_directories(mbed-nanostack-sal_stack
 target_link_libraries(mbed-nanostack-sal_stack
     PUBLIC
         mbed-nanostack-libservice
-        mbed-core-flags
+        mbed-application-profile-flags
         mbed-nanostack-sal_stack-event_loop
         mbed-randlib
         mbed-mbedtls

diff --git a/connectivity/netsocket/CMakeLists.txt b/connectivity/netsocket/CMakeLists.txt
@@ -53,7 +53,7 @@ target_compile_definitions(mbed-netsocket-api
 
 target_link_libraries(mbed-netsocket-api
     PUBLIC
-        mbed-core-flags
+        mbed-application-profile-flags
         mbed-mbedtls
         mbed-nanostack-libservice
 )

diff --git a/connectivity/netsocket/tests/emac_test_utils/CMakeLists.txt b/connectivity/netsocket/tests/emac_test_utils/CMakeLists.txt
@@ -7,8 +7,7 @@ target_sources(mbed-emac-test-utils PRIVATE
     EmacTestNetworkStack.cpp)
 target_include_directories(mbed-emac-test-utils PUBLIC .)
 target_link_libraries(mbed-emac-test-utils PUBLIC
-    mbed-core-flags
-    mbed-rtos-flags
+    mbed-application-profile-flags
     mbed-netsocket-api
 	mbed-nanostack-libservice
 	mbed-nanostack-hal_mbed_cmsis_rtos)
diff --git a/drivers/usb/CMakeLists.txt b/drivers/usb/CMakeLists.txt
@@ -33,7 +33,7 @@ if("DEVICE_USBDEVICE=1" IN_LIST MBED_TARGET_DEFINITIONS)
             include/usb/internal
     )
 
-    target_link_libraries(mbed-usb PUBLIC mbed-core-flags)
+    target_link_libraries(mbed-usb PUBLIC mbed-application-profile-flags)
 
     # USB Mass Storage Device library is separate because it pulls in a dependency on mbed-storage-blockdevice
     add_library(mbed-usb-msd STATIC EXCLUDE_FROM_ALL
@@ -56,5 +56,5 @@ if("DEVICE_USBDEVICE=1" IN_LIST MBED_TARGET_DEFINITIONS)
             include/usb/cdc_ecm
     )
 
-    target_link_libraries(mbed-usb-cdc-ecm PUBLIC mbed-usb mbed-rtos-flags)
+    target_link_libraries(mbed-usb-cdc-ecm PUBLIC mbed-usb)
 endif()
diff --git a/features/frameworks/greentea-client/CMakeLists.txt b/features/frameworks/greentea-client/CMakeLists.txt
@@ -14,4 +14,4 @@ target_sources(mbed-greentea
         source/greentea_test_env.cpp
 )
 
-target_link_libraries(mbed-greentea PUBLIC mbed-core-flags)
+target_link_libraries(mbed-greentea PUBLIC mbed-application-profile-flags)
diff --git a/features/frameworks/mbed-greentea-io/CMakeLists.txt b/features/frameworks/mbed-greentea-io/CMakeLists.txt
@@ -3,4 +3,4 @@
 
 add_library(mbed-greentea-io STATIC EXCLUDE_FROM_ALL)
 target_sources(mbed-greentea-io PRIVATE mbed_io.cpp)
-target_link_libraries(mbed-greentea-io PUBLIC mbed-core-flags)
+target_link_libraries(mbed-greentea-io PUBLIC mbed-application-profile-flags)
diff --git a/features/frameworks/unity/CMakeLists.txt b/features/frameworks/unity/CMakeLists.txt
@@ -12,4 +12,4 @@ target_sources(mbed-unity
         source/unity.c
 )
 
-target_link_libraries(mbed-unity PUBLIC mbed-core-flags mbed-utest)
+target_link_libraries(mbed-unity PUBLIC mbed-application-profile-flags mbed-utest)
diff --git a/features/frameworks/utest/CMakeLists.txt b/features/frameworks/utest/CMakeLists.txt
@@ -22,4 +22,4 @@ target_sources(mbed-utest
         source/utest_types.cpp
 )
 
-target_link_libraries(mbed-utest PUBLIC mbed-core-flags mbed-unity)
+target_link_libraries(mbed-utest PUBLIC mbed-application-profile-flags mbed-unity)
diff --git a/platform/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/CMakeLists.txt b/platform/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/CMakeLists.txt
@@ -22,4 +22,4 @@ target_sources(mbed-psa
         src/psa_hrng.c
 )
 
-target_link_libraries(mbed-psa PRIVATE mbed-core-flags)
+target_link_libraries(mbed-psa PRIVATE mbed-application-profile-flags)
diff --git a/platform/randlib/CMakeLists.txt b/platform/randlib/CMakeLists.txt
@@ -19,5 +19,5 @@ target_sources(mbed-randlib
 target_link_libraries(mbed-randlib
     PUBLIC
         mbed-mbedtls
-        mbed-core-flags
+        mbed-application-profile-flags
 )
diff --git a/storage/blockdevice/CMakeLists.txt b/storage/blockdevice/CMakeLists.txt
@@ -69,4 +69,4 @@ target_sources(mbed-storage-blockdevice
         source/SlicingBlockDevice.cpp
 )
 
-target_link_libraries(mbed-storage-blockdevice PUBLIC mbed-core-flags)
+target_link_libraries(mbed-storage-blockdevice PUBLIC mbed-application-profile-flags)