From b94ddf6cd70e811e4bc3f3c28ef7195bcf2bb0cf Mon Sep 17 00:00:00 2001 From: Gilles Khouzam Date: Mon, 28 Jul 2014 14:27:59 -0400 Subject: CMakeDetermineCompilerId: Recognize WindowsPhone and WindowsStore When CMAKE_SYSTEM_NAME is set to target one of these, add ApplicationType and ApplicationTypeRevision elements to the .vcxproj file used to identify the compiler so that the WindowsPhone or WindowsStore toolchains can work. Co-Author: Brad King --- Modules/CMakeDetermineCompilerId.cmake | 12 ++++++++++++ Modules/CompilerId/VS-10.vcxproj.in | 2 ++ 2 files changed, 14 insertions(+) diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake index 025d296..a780fa6 100644 --- a/Modules/CMakeDetermineCompilerId.cmake +++ b/Modules/CMakeDetermineCompilerId.cmake @@ -168,6 +168,18 @@ Id flags: ${testflags} else() set(id_toolset "") endif() + if(CMAKE_SYSTEM_NAME STREQUAL "WindowsPhone") + set(id_system "Windows Phone") + elseif(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + set(id_system "Windows Store") + else() + set(id_system "") + endif() + if(id_system AND CMAKE_SYSTEM_VERSION) + set(id_system_version "${CMAKE_SYSTEM_VERSION}") + else() + set(id_system_version "") + endif() if(CMAKE_VS_WINCE_VERSION) set(id_entrypoint "mainACRTStartup") if("${vs_version}" VERSION_LESS 9) diff --git a/Modules/CompilerId/VS-10.vcxproj.in b/Modules/CompilerId/VS-10.vcxproj.in index 1a7a539..bacbca4 100644 --- a/Modules/CompilerId/VS-10.vcxproj.in +++ b/Modules/CompilerId/VS-10.vcxproj.in @@ -10,6 +10,8 @@ {CAE07175-D007-4FC3-BFE8-47B392814159} CompilerId@id_lang@ Win32Proj + @id_system@ + @id_system_version@ -- cgit v0.12