diff options
| author | Jan Hrubý <jhruby.web@gmail.com> | 2017-03-13 08:56:05 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-13 08:56:05 +0100 |
| commit | 665f4118f603c5858217ed7a2f2f824b18ff4fc5 (patch) | |
| tree | f0167041edf71e90f2331b5025f603392a8de67a /triplets | |
| parent | 1bec0fcb73073b5b1719f454c368a63f1bff625e (diff) | |
| parent | 1c9873a0daf625f67474aaf3e163c592c27ecb65 (diff) | |
| download | vcpkg-665f4118f603c5858217ed7a2f2f824b18ff4fc5.tar.gz vcpkg-665f4118f603c5858217ed7a2f2f824b18ff4fc5.zip | |
Merge pull request #1 from Microsoft/master
pull
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) |