diff options
| author | Brad King <brad.king@kitware.com> | 2015-10-05 14:04:11 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-10-05 14:04:11 (GMT) |
| commit | 6c25ceb6a841c9d24090f39851e1a89986ab9d4c (patch) | |
| tree | 15bfc441c7e8bd12785d9ab715743c47f892d4a4 /Modules | |
| parent | 518dc277281cf2280f9846f2ce2039440cda4ba9 (diff) | |
| parent | 2402bb8cfd63078623779a3704227915324e52d4 (diff) | |
| download | CMake-6c25ceb6a841c9d24090f39851e1a89986ab9d4c.zip CMake-6c25ceb6a841c9d24090f39851e1a89986ab9d4c.tar.gz CMake-6c25ceb6a841c9d24090f39851e1a89986ab9d4c.tar.bz2 | |
Merge topic 'vs-win10-store'
2402bb8c Help: Document Windows 10 Universal Applications in cmake-toolchains(7)
1be2f12c VS: Add support for Windows 10 Universal (Store) Applications
2798dbda VS: Refactor indentation of LinkLibraryDependencies
8c426183 MSVC: Add system libs for WindowsStore on VS 2015
d1b87d72 VS: Select Windows 10 Store SDK and toolset for VS 2015
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/Platform/Windows-MSVC.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Modules/Platform/Windows-MSVC.cmake b/Modules/Platform/Windows-MSVC.cmake index 8594596..b421b0d 100644 --- a/Modules/Platform/Windows-MSVC.cmake +++ b/Modules/Platform/Windows-MSVC.cmake @@ -179,7 +179,9 @@ elseif(WINDOWS_PHONE OR WINDOWS_STORE) set(_PLATFORM_DEFINES "/DWIN32") set(_FLAGS_C " /DUNICODE /D_UNICODE") set(_FLAGS_CXX " /DUNICODE /D_UNICODE /GR /EHsc") - if(WINDOWS_PHONE) + if(WINDOWS_STORE AND MSVC_VERSION GREATER 1899) + set(CMAKE_C_STANDARD_LIBRARIES_INIT "WindowsApp.lib") + elseif(WINDOWS_PHONE) set(CMAKE_C_STANDARD_LIBRARIES_INIT "WindowsPhoneCore.lib RuntimeObject.lib PhoneAppModelHost.lib") elseif(_MSVC_C_ARCHITECTURE_FAMILY STREQUAL "ARM" OR _MSVC_CXX_ARCHITECTURE_FAMILY STREQUAL "ARM") set(CMAKE_C_STANDARD_LIBRARIES_INIT "kernel32.lib user32.lib") |