diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2016-09-28 12:16:20 -0700 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2016-10-05 17:44:02 -0700 |
| commit | 0fc610b2f7b976de8b773ed7359cc6b35469e5dc (patch) | |
| tree | 98d6c03860f29273d5df2371cb0b7f5979f2ebb7 | |
| parent | 8b4f7d4a983e8d9487161cd71d4e519b03c1ed21 (diff) | |
| download | vcpkg-0fc610b2f7b976de8b773ed7359cc6b35469e5dc.tar.gz vcpkg-0fc610b2f7b976de8b773ed7359cc6b35469e5dc.zip | |
Triplet files now define variables for arch, linkage, etc
| -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..57af87881 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_BUILD_SHARED_LIBS ON) -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..1b5dd34df 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_BUILD_SHARED_LIBS ON) -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..79e1a8d11 --- /dev/null +++ b/triplets/x64-windows-static.cmake @@ -0,0 +1,3 @@ +set(VCPKG_TARGET_ARCHITECTURE x64) +set(VCPKG_CRT_LINKAGE static) +set(VCPKG_BUILD_SHARED_LIBS OFF) diff --git a/triplets/x64-windows.cmake b/triplets/x64-windows.cmake index e69de29bb..1f8d2c957 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_BUILD_SHARED_LIBS ON) + diff --git a/triplets/x86-uwp.cmake b/triplets/x86-uwp.cmake index a0c5601bb..5a2927a4d 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_BUILD_SHARED_LIBS ON) -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..6697dea45 --- /dev/null +++ b/triplets/x86-windows-static.cmake @@ -0,0 +1,3 @@ +set(VCPKG_TARGET_ARCHITECTURE x86) +set(VCPKG_CRT_LINKAGE static) +set(VCPKG_BUILD_SHARED_LIBS OFF)
\ No newline at end of file diff --git a/triplets/x86-windows.cmake b/triplets/x86-windows.cmake index e69de29bb..08a232739 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_BUILD_SHARED_LIBS ON) |