From c8a4925de05ddd8685ba093e35383f9c61c68671 Mon Sep 17 00:00:00 2001
From: Minmin Gong <minmin.gong@gmail.com>
Date: Sat, 9 Aug 2014 17:31:19 +0800
Subject: [PATCH] Fix INSTALL and toolset in Windows store ARM and phone. 1.
 Add WindowsSDKDesktopARMSupport tag to all target type >= UTILITY (UTILITY,
 GLOBAL_TARGET, INTERFACE_LIBRARY and UNKNOWN_LIBRARY) for ARM platform. 2.
 Fix toolset name in Windows phone platform when target type >= UTILITY.

---
 Source/cmVisualStudio10TargetGenerator.cxx | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 6989c51..5f77587 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -286,9 +286,17 @@ void cmVisualStudio10TargetGenerator::Generate()
   this->WriteString("<ProjectGUID>", 2);
   (*this->BuildFileStream) <<  "{" << this->GUID << "}</ProjectGUID>\n";
 
-  if(this->MSTools && this->Target->GetType() <= cmTarget::UTILITY)
+  if(this->MSTools)
     {
-    this->WriteApplicationTypeSettings();
+    if(this->Target->GetType() < cmTarget::UTILITY)
+      {
+      this->WriteApplicationTypeSettings();
+      }
+    else if(this->Platform == "ARM")
+      {
+      this->WriteString("<WindowsSDKDesktopARMSupport>true"
+                      "</WindowsSDKDesktopARMSupport>", 2);
+      }
     }
 
   const char* vsProjectTypes =
@@ -606,7 +614,15 @@ void cmVisualStudio10TargetGenerator
   if(const char* toolset = gg->GetPlatformToolset())
     {
     std::string pts = "<PlatformToolset>";
-    pts += toolset;
+    if(this->GlobalGenerator->TargetsWindowsPhone() && (this->Target->GetType() >= cmTarget::UTILITY))
+      {
+      std::string toolset_str = toolset;
+      pts += toolset_str.substr(0, toolset_str.find('_'));
+      }
+    else
+      {
+      pts += toolset;
+      }
     pts += "</PlatformToolset>\n";
     this->WriteString(pts.c_str(), 2);
     }
-- 
1.8.5.2.msysgit.0