Skip to content
This repository was archived by the owner on Jun 5, 2019. It is now read-only.

Commit abb6a64

Browse files
committed
Added CMSIS version check (require 4.3.0)
1 parent 6fe029c commit abb6a64

File tree

1 file changed

+13
-3
lines changed

1 file changed

+13
-3
lines changed

DeviceCode/Targets/OS/CMSIS_RTOS/CMSIS_RTOS.settings

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515
<TARGETCODEBASE>CMSIS_RTOS</TARGETCODEBASE>
1616
<TARGETCODEBASETYPE>OS</TARGETCODEBASETYPE>
1717
<IsSolutionWizardVisible>false</IsSolutionWizardVisible>
18+
<CMSIS_RequiredVersion>4.3.0</CMSIS_RequiredVersion>
1819
</PropertyGroup>
1920
<ItemGroup>
2021
<CC_CPP_Defines Include="__CMSIS_RTOS" />
21-
<CC_CPP_Defines Include="PLATFORM_ARM_OS_PORT" />
22+
<CC_CPP_Defines Include="PLATFORM_ARM_OS_PORT" />
2223
</ItemGroup>
2324
<ItemGroup>
2425
<IncludePaths Include="CMSIS\CMSIS\Include" />
25-
<IncludePaths Include="CMSIS\CMSIS_RTX" />
26-
<IncludePaths Include="CMSIS\CMSIS_RTX\INC" />
26+
<IncludePaths Include="CMSIS\CMSIS\RTOS\RTX\INC" />
2727
</ItemGroup>
2828
<ItemGroup Condition="'$(TCP_IP_STACK)'=='LWIP_1_4_1_OS'">
2929
<IncludePaths Include="DeviceCode\Targets\OS\CMSIS_RTOS\DeviceCode\lwip_1_4_1_os"/>
@@ -33,5 +33,15 @@
3333
Condition="!EXISTS('$(SPOCLIENT)\CMSIS\ARM.CMSIS.pdsc')"
3434
Text="Missing CMSIS installation at: $(SPOCLIENT)\CMSIS\*"
3535
/>
36+
<!-- Check CMSIS version -->
37+
<XmlPeek XmlInputPath="$(SPOCLIENT)\CMSIS\ARM.CMSIS.pdsc"
38+
Query="/package/releases/release[1]/@version"
39+
>
40+
<Output TaskParameter="Result" PropertyName="CMSIS_CurrentVersion" />
41+
</XmlPeek>
42+
<Error Code="NETMFBLD"
43+
Condition="'$(CMSIS_RequiredVersion)'!='$(CMSIS_CurrentVersion)'"
44+
Text="Required CMSIS version $(CMSIS_RequiredVersion) (detected $(CMSIS_CurrentVersion))"
45+
/>
3646
</Target>
3747
</Project>

0 commit comments

Comments
 (0)