diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2016-11-04 17:05:00 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2016-11-04 17:05:00 -0700 |
| commit | 8c73539499f2211baa7cdf3248856bb1f45a7947 (patch) | |
| tree | a86e0f81b295a9e5fcebe85dec1aad2ea3aca58b /ports/zlib | |
| parent | d7ff71610b5eed96c86374ad0fb41857a49839cb (diff) | |
| parent | f413b423960ab6080681d460a042a2e09dc1c0e6 (diff) | |
| download | vcpkg-8c73539499f2211baa7cdf3248856bb1f45a7947.tar.gz vcpkg-8c73539499f2211baa7cdf3248856bb1f45a7947.zip | |
Merge branch 'master' of https://github.com/microsoft/vcpkg
Diffstat (limited to 'ports/zlib')
| -rw-r--r-- | ports/zlib/portfile.cmake | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ports/zlib/portfile.cmake b/ports/zlib/portfile.cmake index 35ca5ff6d..1d6d807d4 100644 --- a/ports/zlib/portfile.cmake +++ b/ports/zlib/portfile.cmake @@ -18,6 +18,7 @@ vcpkg_configure_cmake( vcpkg_install_cmake() +# Both dynamic and static are built, so keep only the one needed if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/zlibstatic.lib ${CURRENT_PACKAGES_DIR}/debug/lib/zlibstaticd.lib) else() |