kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

CMakeDetermineCompilerId: Fix detection for VS ARM platform 

Add WindowsSDKDesktopARMSupport to the compiler id .vcxproj to
avoid 'error MSB8022: Compiling Desktop applications for the ARM
platform is not supported.' from VS.

Inspired-by: Minmin Gong <minmin.gong@gmail.com>
Inspired-by: Gilles Khouzam <gillesk@microsoft.com>
This commit is contained in:
Brad King 2014-08-05 14:44:12 -04:00
parent 5d3d9a22b2
commit dbb5a7ee31
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Modules/CMakeDetermineCompilerId.cmake
View File

@ -180,6 +180,11 @@ Id flags: ${testflags}
else() else()
set(id_system_version "") set(id_system_version "")
endif() endif()
if(id_platform STREQUAL ARM)
set(id_WindowsSDKDesktopARMSupport "<WindowsSDKDesktopARMSupport>true</WindowsSDKDesktopARMSupport>")
else()
set(id_WindowsSDKDesktopARMSupport "")
endif()
if(CMAKE_VS_WINCE_VERSION) if(CMAKE_VS_WINCE_VERSION)
set(id_entrypoint "mainACRTStartup") set(id_entrypoint "mainACRTStartup")
if("${vs_version}" VERSION_LESS 9) if("${vs_version}" VERSION_LESS 9)

1
Modules/CompilerId/VS-10.vcxproj.in
View File

@ -12,6 +12,7 @@
<Keyword>Win32Proj</Keyword> <Keyword>Win32Proj</Keyword>
@id_system@ @id_system@
@id_system_version@ @id_system_version@
@id_WindowsSDKDesktopARMSupport@
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@id_platform@'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@id_platform@'" Label="Configuration">