freertos-config: Fix library definitions scope (#1164)

AhmedIsmail02 · web-flow · commit c0585ad814c9 · 2024-10-25T15:33:33.000-07:00
Since `freertos_config` is an interface library,
`INTERFACE` scope shall be used to define compile
definitions.

Signed-off-by: Ahmed Ismail &lt;Ahmed.Ismail@arm.com&gt;
diff --git a/portable/CMakeLists.txt b/portable/CMakeLists.txt
@@ -804,7 +804,7 @@ if (DEFINED FREERTOS_ARM_V_8_1_M_PACBTI_CONFIG )
                         -mbranch-protection=bti+pac-ret+leaf
                 )
                 target_compile_definitions(freertos_config
-                    PUBLIC
+                    INTERFACE
                         configENABLE_PAC=1
                         configENABLE_BTI=1
                 )
@@ -815,7 +815,7 @@ if (DEFINED FREERTOS_ARM_V_8_1_M_PACBTI_CONFIG )
             target_compile_options(freertos_kernel_port PUBLIC $<$<STREQUAL:${CMAKE_C_COMPILER_ID},ARMClang>:-mbranch-protection=pac-ret>)
             target_compile_options(freertos_kernel_port PUBLIC $<$<STREQUAL:${CMAKE_C_COMPILER_ID},IAR>:$<$<COMPILE_LANGUAGE:C,CXX>:--branch_protection=pac-ret>>)
             target_compile_definitions(freertos_config
-                PUBLIC
+                INTERFACE
                     configENABLE_PAC=1
             )
         elseif(FREERTOS_ARM_V_8_1_M_PACBTI_CONFIG STREQUAL "ARM_V_8_1_M_PACBTI_CONFIG_PACRET_LEAF")
@@ -825,7 +825,7 @@ if (DEFINED FREERTOS_ARM_V_8_1_M_PACBTI_CONFIG )
                         -mbranch-protection=pac-ret+leaf
                 )
                 target_compile_definitions(freertos_config
-                    PUBLIC
+                    INTERFACE
                         configENABLE_PAC=1
                 )
             elseif(${CMAKE_C_COMPILER_ID} STREQUAL "IAR")
@@ -835,7 +835,7 @@ if (DEFINED FREERTOS_ARM_V_8_1_M_PACBTI_CONFIG )
             target_compile_options(freertos_kernel_port PUBLIC $<$<STREQUAL:${CMAKE_C_COMPILER_ID},ARMClang>:-mbranch-protection=bti>)
             target_compile_options(freertos_kernel_port PUBLIC $<$<STREQUAL:${CMAKE_C_COMPILER_ID},IAR>:$<$<COMPILE_LANGUAGE:C,CXX>:--branch_protection=bti>>)
             target_compile_definitions(freertos_config
-                PUBLIC
+                INTERFACE
                     configENABLE_BTI=1
             )
         elseif(FREERTOS_ARM_V_8_1_M_PACBTI_CONFIG STREQUAL "ARM_V_8_1_M_PACBTI_CONFIG_NONE")
@@ -846,7 +846,7 @@ if (DEFINED FREERTOS_ARM_V_8_1_M_PACBTI_CONFIG )
                 )
             endif()
             target_compile_definitions(freertos_config
-                PUBLIC
+                INTERFACE
                     configENABLE_PAC=0
                     configENABLE_BTI=0
             )

Original file line number	Diff line number	Diff line change
`@@ -804,7 +804,7 @@ if (DEFINED FREERTOS_ARM_V_8_1_M_PACBTI_CONFIG )`
`804`	`804`	`-mbranch-protection=bti+pac-ret+leaf`
`805`	`805`	`)`
`806`	`806`	`target_compile_definitions(freertos_config`
`807`		`- PUBLIC`
	`807`	`+ INTERFACE`
`808`	`808`	`configENABLE_PAC=1`
`809`	`809`	`configENABLE_BTI=1`
`810`	`810`	`)`
`@@ -815,7 +815,7 @@ if (DEFINED FREERTOS_ARM_V_8_1_M_PACBTI_CONFIG )`
`815`	`815`	`target_compile_options(freertos_kernel_port PUBLIC $<$<STREQUAL:${CMAKE_C_COMPILER_ID},ARMClang>:-mbranch-protection=pac-ret>)`
`816`	`816`	`target_compile_options(freertos_kernel_port PUBLIC $<$<STREQUAL:${CMAKE_C_COMPILER_ID},IAR>:$<$<COMPILE_LANGUAGE:C,CXX>:--branch_protection=pac-ret>>)`
`817`	`817`	`target_compile_definitions(freertos_config`
`818`		`- PUBLIC`
	`818`	`+ INTERFACE`
`819`	`819`	`configENABLE_PAC=1`
`820`	`820`	`)`
`821`	`821`	`elseif(FREERTOS_ARM_V_8_1_M_PACBTI_CONFIG STREQUAL "ARM_V_8_1_M_PACBTI_CONFIG_PACRET_LEAF")`
`@@ -825,7 +825,7 @@ if (DEFINED FREERTOS_ARM_V_8_1_M_PACBTI_CONFIG )`
`825`	`825`	`-mbranch-protection=pac-ret+leaf`
`826`	`826`	`)`
`827`	`827`	`target_compile_definitions(freertos_config`
`828`		`- PUBLIC`
	`828`	`+ INTERFACE`
`829`	`829`	`configENABLE_PAC=1`
`830`	`830`	`)`
`831`	`831`	`elseif(${CMAKE_C_COMPILER_ID} STREQUAL "IAR")`
`@@ -835,7 +835,7 @@ if (DEFINED FREERTOS_ARM_V_8_1_M_PACBTI_CONFIG )`
`835`	`835`	`target_compile_options(freertos_kernel_port PUBLIC $<$<STREQUAL:${CMAKE_C_COMPILER_ID},ARMClang>:-mbranch-protection=bti>)`
`836`	`836`	`target_compile_options(freertos_kernel_port PUBLIC $<$<STREQUAL:${CMAKE_C_COMPILER_ID},IAR>:$<$<COMPILE_LANGUAGE:C,CXX>:--branch_protection=bti>>)`
`837`	`837`	`target_compile_definitions(freertos_config`
`838`		`- PUBLIC`
	`838`	`+ INTERFACE`
`839`	`839`	`configENABLE_BTI=1`
`840`	`840`	`)`
`841`	`841`	`elseif(FREERTOS_ARM_V_8_1_M_PACBTI_CONFIG STREQUAL "ARM_V_8_1_M_PACBTI_CONFIG_NONE")`
`@@ -846,7 +846,7 @@ if (DEFINED FREERTOS_ARM_V_8_1_M_PACBTI_CONFIG )`
`846`	`846`	`)`
`847`	`847`	`endif()`
`848`	`848`	`target_compile_definitions(freertos_config`
`849`		`- PUBLIC`
	`849`	`+ INTERFACE`
`850`	`850`	`configENABLE_PAC=0`
`851`	`851`	`configENABLE_BTI=0`
`852`	`852`	`)`