Triplet files now define variables for arch, linkage, etc

attila-kun · Oct 6, 2016 · 0fc610b · 0fc610b
1 parent 8b4f7d4
commit 0fc610b
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 15 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -0,0 +1,3 @@
+set(VCPKG_TARGET_ARCHITECTURE x86)
+set(VCPKG_CRT_LINKAGE static)
+set(VCPKG_BUILD_SHARED_LIBS OFF)
diff --git 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)