aboutsummaryrefslogtreecommitdiff
path: root/triplets
diff options
context:
space:
mode:
authorAlexander Karatarakis <alkarata@microsoft.com>2016-10-07 16:34:31 -0700
committerAlexander Karatarakis <alkarata@microsoft.com>2016-10-07 16:34:31 -0700
commit50fb104f6a36c8a3565c3189f5ce6ac34a74282a (patch)
tree2ae3cd3fb291b06a2b2f32d41908ca1baa66375a /triplets
parent1a95b4a0eca0afe7cb3084ba02dc65931cdd65a0 (diff)
downloadvcpkg-50fb104f6a36c8a3565c3189f5ce6ac34a74282a.tar.gz
vcpkg-50fb104f6a36c8a3565c3189f5ce6ac34a74282a.zip
Change VCPKG_BUILD_SHARED_LIBS to VCPKG_LIBRARY_LINKAGE with values
dynamic or static
Diffstat (limited to 'triplets')
-rw-r--r--triplets/arm-uwp.cmake2
-rw-r--r--triplets/x64-uwp.cmake2
-rw-r--r--triplets/x64-windows-static.cmake2
-rw-r--r--triplets/x64-windows.cmake2
-rw-r--r--triplets/x86-uwp.cmake2
-rw-r--r--triplets/x86-windows-static.cmake2
-rw-r--r--triplets/x86-windows.cmake2
7 files changed, 7 insertions, 7 deletions
diff --git a/triplets/arm-uwp.cmake b/triplets/arm-uwp.cmake
index 57af87881..678643eb1 100644
--- a/triplets/arm-uwp.cmake
+++ b/triplets/arm-uwp.cmake
@@ -1,6 +1,6 @@
set(VCPKG_TARGET_ARCHITECTURE arm)
set(VCPKG_CRT_LINKAGE dynamic)
-set(VCPKG_BUILD_SHARED_LIBS ON)
+set(VCPKG_LIBRARY_LINKAGE dynamic)
set(VCPKG_CMAKE_SYSTEM_NAME WindowsStore)
set(VCPKG_CMAKE_SYSTEM_VERSION 10.0)
diff --git a/triplets/x64-uwp.cmake b/triplets/x64-uwp.cmake
index 1b5dd34df..ca6455fc8 100644
--- a/triplets/x64-uwp.cmake
+++ b/triplets/x64-uwp.cmake
@@ -1,6 +1,6 @@
set(VCPKG_TARGET_ARCHITECTURE x64)
set(VCPKG_CRT_LINKAGE dynamic)
-set(VCPKG_BUILD_SHARED_LIBS ON)
+set(VCPKG_LIBRARY_LINKAGE dynamic)
set(VCPKG_CMAKE_SYSTEM_NAME WindowsStore)
set(VCPKG_CMAKE_SYSTEM_VERSION 10.0)
diff --git a/triplets/x64-windows-static.cmake b/triplets/x64-windows-static.cmake
index 79e1a8d11..75f9b9532 100644
--- a/triplets/x64-windows-static.cmake
+++ b/triplets/x64-windows-static.cmake
@@ -1,3 +1,3 @@
set(VCPKG_TARGET_ARCHITECTURE x64)
set(VCPKG_CRT_LINKAGE static)
-set(VCPKG_BUILD_SHARED_LIBS OFF)
+set(VCPKG_LIBRARY_LINKAGE static)
diff --git a/triplets/x64-windows.cmake b/triplets/x64-windows.cmake
index 1f8d2c957..d0be7297f 100644
--- a/triplets/x64-windows.cmake
+++ b/triplets/x64-windows.cmake
@@ -1,4 +1,4 @@
set(VCPKG_TARGET_ARCHITECTURE x64)
set(VCPKG_CRT_LINKAGE dynamic)
-set(VCPKG_BUILD_SHARED_LIBS ON)
+set(VCPKG_LIBRARY_LINKAGE dynamic)
diff --git a/triplets/x86-uwp.cmake b/triplets/x86-uwp.cmake
index 5a2927a4d..7e2d4d2c0 100644
--- a/triplets/x86-uwp.cmake
+++ b/triplets/x86-uwp.cmake
@@ -1,6 +1,6 @@
set(VCPKG_TARGET_ARCHITECTURE x86)
set(VCPKG_CRT_LINKAGE dynamic)
-set(VCPKG_BUILD_SHARED_LIBS ON)
+set(VCPKG_LIBRARY_LINKAGE dynamic)
set(VCPKG_CMAKE_SYSTEM_NAME WindowsStore)
set(VCPKG_CMAKE_SYSTEM_VERSION 10.0)
diff --git a/triplets/x86-windows-static.cmake b/triplets/x86-windows-static.cmake
index 6697dea45..c855f0caa 100644
--- a/triplets/x86-windows-static.cmake
+++ b/triplets/x86-windows-static.cmake
@@ -1,3 +1,3 @@
set(VCPKG_TARGET_ARCHITECTURE x86)
set(VCPKG_CRT_LINKAGE static)
-set(VCPKG_BUILD_SHARED_LIBS OFF) \ No newline at end of file
+set(VCPKG_LIBRARY_LINKAGE static) \ No newline at end of file
diff --git a/triplets/x86-windows.cmake b/triplets/x86-windows.cmake
index 08a232739..40ccbe152 100644
--- a/triplets/x86-windows.cmake
+++ b/triplets/x86-windows.cmake
@@ -1,3 +1,3 @@
set(VCPKG_TARGET_ARCHITECTURE x86)
set(VCPKG_CRT_LINKAGE dynamic)
-set(VCPKG_BUILD_SHARED_LIBS ON)
+set(VCPKG_LIBRARY_LINKAGE dynamic)