diff options
| author | Andrei Lebedev <lebdron@gmail.com> | 2019-05-20 20:24:51 +0300 |
|---|---|---|
| committer | Curtis J Bezault <curtbezault@gmail.com> | 2019-05-20 10:24:51 -0700 |
| commit | 4b45f9b56d62c8096520a9f1bdca42182372a4ea (patch) | |
| tree | e2034b1805138679e8aa55e2a5e0ea1bbbd7a1cd /ports/zstd | |
| parent | a792611535450e33c2fd873196d29aed4b45eb1f (diff) | |
| download | vcpkg-4b45f9b56d62c8096520a9f1bdca42182372a4ea.tar.gz vcpkg-4b45f9b56d62c8096520a9f1bdca42182372a4ea.zip | |
[grpc,fmt,zstd] Add Windows-specific conditionals (#6509)
Check VCPKG_CMAKE_SYSTEM_NAME prior to performing Windows-specific
actions in portfiles
Signed-off-by: Andrei Lebedev <lebdron@gmail.com>
Diffstat (limited to 'ports/zstd')
| -rw-r--r-- | ports/zstd/CONTROL | 2 | ||||
| -rw-r--r-- | ports/zstd/portfile.cmake | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ports/zstd/CONTROL b/ports/zstd/CONTROL index 985c24b0c..a0125ee54 100644 --- a/ports/zstd/CONTROL +++ b/ports/zstd/CONTROL @@ -1,3 +1,3 @@ Source: zstd -Version: 1.3.7-1 +Version: 1.3.7-2 Description: Zstandard - Fast real-time compression algorithm http://www.zstd.net diff --git a/ports/zstd/portfile.cmake b/ports/zstd/portfile.cmake index dfbb2e3f2..98440ab17 100644 --- a/ports/zstd/portfile.cmake +++ b/ports/zstd/portfile.cmake @@ -40,7 +40,7 @@ vcpkg_install_cmake() vcpkg_copy_pdbs() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) -if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") +if((VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" OR NOT VCPKG_CMAKE_SYSTEM_NAME) AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") foreach(HEADER zdict.h zstd.h zstd_errors.h) file(READ ${CURRENT_PACKAGES_DIR}/include/${HEADER} HEADER_CONTENTS) string(REPLACE "defined(ZSTD_DLL_IMPORT) && (ZSTD_DLL_IMPORT==1)" "1" HEADER_CONTENTS "${HEADER_CONTENTS}") |