mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-24 11:39:01 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[vcpkg-toolchain] Compare CMAKE_SYSTEM_NAME, not WINDOWS_STORE. Fixes #1179.

Browse Source
This commit is contained in:
Robert Schumacher 2017-05-28 13:07:20 -07:00
parent 2f154a0580
commit 334a35e425
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scripts/buildsystems/vcpkg.cmake
View File

@ -1,3 +1,6 @@
# Mark variables as used so cmake doesn't complain about them
set(CMAKE_TOOLCHAIN_FILE ${CMAKE_TOOLCHAIN_FILE})
if(NOT VCPKG_TOOLCHAIN)
if(CMAKE_GENERATOR_PLATFORM MATCHES "^[Ww][Ii][Nn]32$")
set(_VCPKG_TARGET_TRIPLET_ARCH x86)
@ -32,7 +35,7 @@ if(NOT VCPKG_TOOLCHAIN)
endif()
endif()
if(WINDOWS_STORE OR WINDOWS_PHONE)
if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" OR CMAKE_SYSTEM_NAME STREQUAL "WindowsPhone")
set(_VCPKG_TARGET_TRIPLET_PLAT uwp)
else()
set(_VCPKG_TARGET_TRIPLET_PLAT windows)