From 50fb104f6a36c8a3565c3189f5ce6ac34a74282a Mon Sep 17 00:00:00 2001
From: Alexander Karatarakis <alkarata@microsoft.com>
Date: Fri, 7 Oct 2016 16:34:31 -0700
Subject: Change VCPKG_BUILD_SHARED_LIBS to VCPKG_LIBRARY_LINKAGE with values
 dynamic or static

---
 ports/libpng/portfile.cmake | 4 ++--
 ports/zlib/portfile.cmake   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'ports')

diff --git a/ports/libpng/portfile.cmake b/ports/libpng/portfile.cmake
index 45e8d07d2..3b6768560 100644
--- a/ports/libpng/portfile.cmake
+++ b/ports/libpng/portfile.cmake
@@ -13,7 +13,7 @@ vcpkg_apply_patches(
     PATCHES "${CMAKE_CURRENT_LIST_DIR}/use-abort-on-all-platforms.patch"
 )
 
-if(VCPKG_BUILD_SHARED_LIBS)
+if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
     set(PNG_STATIC_LIBS OFF)
     set(PNG_SHARED_LIBS ON)
 else()
@@ -36,7 +36,7 @@ vcpkg_configure_cmake(
 
 vcpkg_install_cmake()
 
-if(VCPKG_BUILD_SHARED_LIBS)
+if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
     vcpkg_copy_pdbs()
 else()
     file(RENAME ${CURRENT_PACKAGES_DIR}/lib/libpng16_static.lib ${CURRENT_PACKAGES_DIR}/lib/libpng16.lib)
diff --git a/ports/zlib/portfile.cmake b/ports/zlib/portfile.cmake
index f87c87a35..ef42536dc 100644
--- a/ports/zlib/portfile.cmake
+++ b/ports/zlib/portfile.cmake
@@ -18,7 +18,7 @@ vcpkg_configure_cmake(
 
 vcpkg_install_cmake()
 
-if(VCPKG_BUILD_SHARED_LIBS)
+if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
     file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/zlibstatic.lib ${CURRENT_PACKAGES_DIR}/debug/lib/zlibstaticd.lib)
     vcpkg_copy_pdbs()
 else()
-- 
cgit v1.2.3