summaryrefslogtreecommitdiffstats
path: root/Source/cmVisualStudio10TargetGenerator.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-10-02 13:58:17 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2015-10-02 13:58:17 (GMT)
commitd80161b08c7f858a222ac6d51262461e5ef7b507 (patch)
tree114ffd8aba8abed3b7670be7703f1077699f5a73 /Source/cmVisualStudio10TargetGenerator.cxx
parent8f545d950166f49bebf92d270d373e7cb98060b8 (diff)
parent3f077996f58ca905125fc2387614b24c68c6f09e (diff)
downloadCMake-d80161b08c7f858a222ac6d51262461e5ef7b507.zip
CMake-d80161b08c7f858a222ac6d51262461e5ef7b507.tar.gz
CMake-d80161b08c7f858a222ac6d51262461e5ef7b507.tar.bz2
Merge topic 'vs-win10-sdk'
3f077996 VS: Add support for selecting the Windows 10 SDK (#15670) 5dfc4c5f VS: Add hook to initialize Windows platform settings 61c472a2 cmSystemTools: Add VersionCompareGreater helper
Diffstat (limited to 'Source/cmVisualStudio10TargetGenerator.cxx')
-rw-r--r--Source/cmVisualStudio10TargetGenerator.cxx10
1 files changed, 10 insertions, 0 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index fcd8f2a..6093f6c 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -3006,6 +3006,8 @@ IsXamlSource(const std::string& sourceFile)
void cmVisualStudio10TargetGenerator::WriteApplicationTypeSettings()
{
+ cmGlobalVisualStudio10Generator* gg =
+ static_cast<cmGlobalVisualStudio10Generator*>(this->GlobalGenerator);
bool isAppContainer = false;
bool const isWindowsPhone = this->GlobalGenerator->TargetsWindowsPhone();
bool const isWindowsStore = this->GlobalGenerator->TargetsWindowsStore();
@@ -3062,6 +3064,14 @@ void cmVisualStudio10TargetGenerator::WriteApplicationTypeSettings()
this->WriteString("<WindowsSDKDesktopARMSupport>true"
"</WindowsSDKDesktopARMSupport>\n", 2);
}
+ std::string const& targetPlatformVersion =
+ gg->GetWindowsTargetPlatformVersion();
+ if (!targetPlatformVersion.empty())
+ {
+ this->WriteString("<WindowsTargetPlatformVersion>", 2);
+ (*this->BuildFileStream) << cmVS10EscapeXML(targetPlatformVersion) <<
+ "</WindowsTargetPlatformVersion>\n";
+ }
}
void cmVisualStudio10TargetGenerator::VerifyNecessaryFiles()