diff options
| author | Brad King <brad.king@kitware.com> | 2015-10-02 13:58:17 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-10-02 13:58:17 (GMT) |
| commit | d80161b08c7f858a222ac6d51262461e5ef7b507 (patch) | |
| tree | 114ffd8aba8abed3b7670be7703f1077699f5a73 /Modules | |
| parent | 8f545d950166f49bebf92d270d373e7cb98060b8 (diff) | |
| parent | 3f077996f58ca905125fc2387614b24c68c6f09e (diff) | |
| download | CMake-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 'Modules')
| -rw-r--r-- | Modules/CMakeDetermineCompilerId.cmake | 3 | ||||
| -rw-r--r-- | Modules/CompilerId/VS-10.vcxproj.in | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake index 591ecb8..2e74100 100644 --- a/Modules/CMakeDetermineCompilerId.cmake +++ b/Modules/CMakeDetermineCompilerId.cmake @@ -210,6 +210,9 @@ Id flags: ${testflags} else() set(id_system_version "") endif() + if(CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION) + set(id_WindowsTargetPlatformVersion "<WindowsTargetPlatformVersion>${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}</WindowsTargetPlatformVersion>") + endif() if(id_platform STREQUAL ARM) set(id_WindowsSDKDesktopARMSupport "<WindowsSDKDesktopARMSupport>true</WindowsSDKDesktopARMSupport>") else() diff --git a/Modules/CompilerId/VS-10.vcxproj.in b/Modules/CompilerId/VS-10.vcxproj.in index a17d03d..2870a11 100644 --- a/Modules/CompilerId/VS-10.vcxproj.in +++ b/Modules/CompilerId/VS-10.vcxproj.in @@ -12,6 +12,7 @@ <Keyword>Win32Proj</Keyword> @id_system@ @id_system_version@ + @id_WindowsTargetPlatformVersion@ @id_WindowsSDKDesktopARMSupport@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> |