summaryrefslogtreecommitdiffstats
path: root/Modules/CMakeDetermineCompilerId.cmake
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-08-05 18:44:12 (GMT)
committerBrad King <brad.king@kitware.com>2014-08-12 14:08:37 (GMT)
commitdbb5a7ee315948b4f16e5c6a549db090e266e51d (patch)
treed983c8dc7b31876eda7196dbd75f4bb422fcd388 /Modules/CMakeDetermineCompilerId.cmake
parent5d3d9a22b28e99894dab2fe4fac0279fb422ace4 (diff)
downloadCMake-dbb5a7ee315948b4f16e5c6a549db090e266e51d.zip
CMake-dbb5a7ee315948b4f16e5c6a549db090e266e51d.tar.gz
CMake-dbb5a7ee315948b4f16e5c6a549db090e266e51d.tar.bz2
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>
Diffstat (limited to 'Modules/CMakeDetermineCompilerId.cmake')
-rw-r--r--Modules/CMakeDetermineCompilerId.cmake5
1 files changed, 5 insertions, 0 deletions
diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake
index a780fa6..1fca55d 100644
--- a/Modules/CMakeDetermineCompilerId.cmake
+++ b/Modules/CMakeDetermineCompilerId.cmake
@@ -180,6 +180,11 @@ Id flags: ${testflags}
else()
set(id_system_version "")
endif()
+ if(id_platform STREQUAL ARM)
+ set(id_WindowsSDKDesktopARMSupport "<WindowsSDKDesktopARMSupport>true</WindowsSDKDesktopARMSupport>")
+ else()
+ set(id_WindowsSDKDesktopARMSupport "")
+ endif()
if(CMAKE_VS_WINCE_VERSION)
set(id_entrypoint "mainACRTStartup")
if("${vs_version}" VERSION_LESS 9)