Make all libraries link mbed-core-flags instead of mbed-rtos-flags

ccli8 · ccli8 · commit b8fa716de0f4 · 2025-01-03T10:39:26.000+08:00
With mbed-core-flags overloaded to match target.application-profile setting,
all libraries should link mbed-core-flags instead of mbed-rtos-flags so that
they build upon correct application profile, involving mbed-rtos-flags or not.
diff --git a/connectivity/cellular/CMakeLists.txt b/connectivity/cellular/CMakeLists.txt
@@ -39,6 +39,5 @@ target_link_libraries(mbed-cellular
     PUBLIC
         mbed-netsocket-api
         mbed-core-flags
-        mbed-rtos-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-core-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
@@ -8,8 +8,7 @@ target_link_libraries(mbed-bluenrg2
     PUBLIC
         mbed-core-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
@@ -8,8 +8,7 @@ target_link_libraries(mbed-bluenrg-ms
     PUBLIC
         mbed-core-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-core-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-core-flags
 		        mbed-netsocket-api
 		)
 	endif()
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-core-flags
 )
 
 if("DEVICE_EMAC=1" IN_LIST MBED_TARGET_DEFINITIONS)
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-core-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-core-flags
 )
 
diff --git a/connectivity/nanostack/mbed-mesh-api/CMakeLists.txt b/connectivity/nanostack/mbed-mesh-api/CMakeLists.txt
@@ -37,8 +37,6 @@ target_link_libraries(mbed-nanostack-mbed_mesh_api
 		mbed-nanostack
         mbed-netsocket-api
         mbed-core-flags
-    PRIVATE
-        mbed-rtos-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
@@ -29,6 +29,4 @@ target_link_libraries(mbed-nanostack-hal_mbed_cmsis_rtos
         mbed-nanostack-sal_stack-event_loop
         mbed-nanostack-libservice
         mbed-nanostack-sal_stack
-    PRIVATE
-        mbed-rtos-flags
 )
diff --git a/connectivity/netsocket/tests/emac_test_utils/CMakeLists.txt b/connectivity/netsocket/tests/emac_test_utils/CMakeLists.txt
@@ -8,7 +8,6 @@ target_sources(mbed-emac-test-utils PRIVATE
 target_include_directories(mbed-emac-test-utils PUBLIC .)
 target_link_libraries(mbed-emac-test-utils PUBLIC
     mbed-core-flags
-    mbed-rtos-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
@@ -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 mbed-core-flags)
 endif()

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,5 @@ target_link_libraries(mbed-cellular`
`39`	`39`	`PUBLIC`
`40`	`40`	`mbed-netsocket-api`
`41`	`41`	`mbed-core-flags`
`42`		`- mbed-rtos-flags`
`43`	`42`	`mbed-randlib`
`44`	`43`	`)`
Original file line number	Diff line number	Diff line change
`@@ -33,5 +33,5 @@ target_link_libraries(mbed-emac`
`33`	`33`	`PUBLIC`
`34`	`34`	`mbed-netsocket-api`
`35`	`35`	`PRIVATE`
`36`		`- mbed-rtos-flags`
	`36`	`+ mbed-core-flags`
`37`	`37`	`)`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ macro(create_mbed_wifi_target)`
`8`	`8`
`9`	`9`	`target_link_libraries(mbed-wifi`
`10`	`10`	`PUBLIC`
`11`		`- mbed-rtos-flags`
	`11`	`+ mbed-core-flags`
`12`	`12`	`mbed-netsocket-api`
`13`	`13`	`)`
`14`	`14`	`endif()`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ target_sources(mbed-wifi`
`15`	`15`	`target_link_libraries(mbed-wifi`
`16`	`16`	`PUBLIC`
`17`	`17`	`mbed-lwipstack`
`18`		`- mbed-rtos-flags`
	`18`	`+ mbed-core-flags`
`19`	`19`	`)`
`20`	`20`
`21`	`21`	`if("DEVICE_EMAC=1" IN_LIST MBED_TARGET_DEFINITIONS)`
Original file line number	Diff line number	Diff line change
`@@ -57,5 +57,5 @@ target_link_libraries(mbed-ppp`
`57`	`57`	`PUBLIC`
`58`	`58`	`mbed-netsocket-api`
`59`	`59`	`PRIVATE`
`60`		`- mbed-rtos-flags`
	`60`	`+ mbed-core-flags`
`61`	`61`	`)`
Original file line number	Diff line number	Diff line change
`@@ -100,6 +100,6 @@ target_link_libraries(mbed-lwipstack`
`100`	`100`	`mbed-ppp`
`101`	`101`	`mbed-randlib`
`102`	`102`	`PRIVATE`
`103`		`- mbed-rtos-flags`
	`103`	`+ mbed-core-flags`
`104`	`104`	`)`
`105`	`105`
Original file line number	Diff line number	Diff line change
`@@ -37,8 +37,6 @@ target_link_libraries(mbed-nanostack-mbed_mesh_api`
`37`	`37`	`mbed-nanostack`
`38`	`38`	`mbed-netsocket-api`
`39`	`39`	`mbed-core-flags`
`40`		`- PRIVATE`
`41`		`- mbed-rtos-flags`
`42`	`40`	`)`
`43`	`41`
`44`	`42`	`# Since there are a lot of circular references between this library and mbed-netsocket-api,`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,4 @@ target_link_libraries(mbed-nanostack-hal_mbed_cmsis_rtos`
`29`	`29`	`mbed-nanostack-sal_stack-event_loop`
`30`	`30`	`mbed-nanostack-libservice`
`31`	`31`	`mbed-nanostack-sal_stack`
`32`		`- PRIVATE`
`33`		`- mbed-rtos-flags`
`34`	`32`	`)`
Original file line number	Diff line number	Diff line change
`@@ -56,5 +56,5 @@ if("DEVICE_USBDEVICE=1" IN_LIST MBED_TARGET_DEFINITIONS)`
`56`	`56`	`include/usb/cdc_ecm`
`57`	`57`	`)`
`58`	`58`
`59`		`- target_link_libraries(mbed-usb-cdc-ecm PUBLIC mbed-usb mbed-rtos-flags)`
	`59`	`+ target_link_libraries(mbed-usb-cdc-ecm PUBLIC mbed-usb mbed-core-flags)`
`60`	`60`	`endif()`