diff options
| author | LiGuilin <liguilin0522@qq.com> | 2016-10-08 08:34:12 +0800 |
|---|---|---|
| committer | LiGuilin <liguilin0522@qq.com> | 2016-10-08 08:34:12 +0800 |
| commit | c91da2b0c4c3d9218c0b4d1712d744bb35245a61 (patch) | |
| tree | e1ae0664a4f21f3948bde8c8f9f9e55dea0cb11f /triplets | |
| parent | 280d88b34033ab728e02f725d8d8ff5f9250c6de (diff) | |
| parent | a0f621c0fca2c3de8bd5249f023979b800c543cf (diff) | |
| download | vcpkg-c91da2b0c4c3d9218c0b4d1712d744bb35245a61.tar.gz vcpkg-c91da2b0c4c3d9218c0b4d1712d744bb35245a61.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'triplets')
| -rw-r--r-- | triplets/arm-uwp.cmake | 11 | ||||
| -rw-r--r-- | triplets/x64-uwp.cmake | 11 | ||||
| -rw-r--r-- | triplets/x64-windows-static.cmake | 3 | ||||
| -rw-r--r-- | triplets/x64-windows.cmake | 4 | ||||
| -rw-r--r-- | triplets/x86-uwp.cmake | 11 | ||||
| -rw-r--r-- | triplets/x86-windows-static.cmake | 3 | ||||
| -rw-r--r-- | triplets/x86-windows.cmake | 3 |
7 files changed, 31 insertions, 15 deletions
diff --git a/triplets/arm-uwp.cmake b/triplets/arm-uwp.cmake index bf88711de..678643eb1 100644 --- a/triplets/arm-uwp.cmake +++ b/triplets/arm-uwp.cmake @@ -1,6 +1,7 @@ -set(CMAKE_SYSTEM_NAME WindowsStore) -set(CMAKE_SYSTEM_VERSION 10.0) +set(VCPKG_TARGET_ARCHITECTURE arm) +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE dynamic) -if(NOT CMAKE_GENERATOR MATCHES "Visual Studio 14 2015 ARM") - message(FATAL_ERROR "Visual Studio Generator must be used to target UWP") -endif() +set(VCPKG_CMAKE_SYSTEM_NAME WindowsStore) +set(VCPKG_CMAKE_SYSTEM_VERSION 10.0) +set(VCPKG_REQUIRE_GENERATOR "Visual Studio 14 2015 Win64") diff --git a/triplets/x64-uwp.cmake b/triplets/x64-uwp.cmake index 53c680bc8..ca6455fc8 100644 --- a/triplets/x64-uwp.cmake +++ b/triplets/x64-uwp.cmake @@ -1,6 +1,7 @@ -set(CMAKE_SYSTEM_NAME WindowsStore) -set(CMAKE_SYSTEM_VERSION 10.0) +set(VCPKG_TARGET_ARCHITECTURE x64) +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE dynamic) -if(NOT CMAKE_GENERATOR MATCHES "Visual Studio 14 2015 Win64") - message(FATAL_ERROR "Visual Studio Generator must be used to target UWP.") -endif() +set(VCPKG_CMAKE_SYSTEM_NAME WindowsStore) +set(VCPKG_CMAKE_SYSTEM_VERSION 10.0) +set(VCPKG_REQUIRE_GENERATOR "Visual Studio 14 2015 Win64") diff --git a/triplets/x64-windows-static.cmake b/triplets/x64-windows-static.cmake new file mode 100644 index 000000000..75f9b9532 --- /dev/null +++ b/triplets/x64-windows-static.cmake @@ -0,0 +1,3 @@ +set(VCPKG_TARGET_ARCHITECTURE x64) +set(VCPKG_CRT_LINKAGE static) +set(VCPKG_LIBRARY_LINKAGE static) diff --git a/triplets/x64-windows.cmake b/triplets/x64-windows.cmake index e69de29bb..d0be7297f 100644 --- a/triplets/x64-windows.cmake +++ b/triplets/x64-windows.cmake @@ -0,0 +1,4 @@ +set(VCPKG_TARGET_ARCHITECTURE x64) +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE dynamic) + diff --git a/triplets/x86-uwp.cmake b/triplets/x86-uwp.cmake index a0c5601bb..7e2d4d2c0 100644 --- a/triplets/x86-uwp.cmake +++ b/triplets/x86-uwp.cmake @@ -1,6 +1,7 @@ -set(CMAKE_SYSTEM_NAME WindowsStore) -set(CMAKE_SYSTEM_VERSION 10.0) +set(VCPKG_TARGET_ARCHITECTURE x86) +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE dynamic) -if(NOT CMAKE_GENERATOR MATCHES "Visual Studio 14 2015") - message(FATAL_ERROR "Visual Studio Generator must be used to target UWP") -endif() +set(VCPKG_CMAKE_SYSTEM_NAME WindowsStore) +set(VCPKG_CMAKE_SYSTEM_VERSION 10.0) +set(VCPKG_REQUIRE_GENERATOR "Visual Studio 14 2015 Win64") diff --git a/triplets/x86-windows-static.cmake b/triplets/x86-windows-static.cmake new file mode 100644 index 000000000..c855f0caa --- /dev/null +++ b/triplets/x86-windows-static.cmake @@ -0,0 +1,3 @@ +set(VCPKG_TARGET_ARCHITECTURE x86) +set(VCPKG_CRT_LINKAGE static) +set(VCPKG_LIBRARY_LINKAGE static)
\ No newline at end of file diff --git a/triplets/x86-windows.cmake b/triplets/x86-windows.cmake index e69de29bb..40ccbe152 100644 --- a/triplets/x86-windows.cmake +++ b/triplets/x86-windows.cmake @@ -0,0 +1,3 @@ +set(VCPKG_TARGET_ARCHITECTURE x86) +set(VCPKG_CRT_LINKAGE dynamic) +set(VCPKG_LIBRARY_LINKAGE dynamic) |