diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2018-06-12 20:15:27 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-06-12 21:13:39 -0700 |
| commit | 66b71a0fba11760073517dde3682cf5a66903e7b (patch) | |
| tree | 910bb6146b8025173bdd561de318fb8e352a78a3 | |
| parent | c24e50d47f68b0b28fd006fba864305593f574ae (diff) | |
| download | vcpkg-66b71a0fba11760073517dde3682cf5a66903e7b.tar.gz vcpkg-66b71a0fba11760073517dde3682cf5a66903e7b.zip | |
[zstd] Fix non-Windows builds
| -rw-r--r-- | ports/zstd/portfile.cmake | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/ports/zstd/portfile.cmake b/ports/zstd/portfile.cmake index c691a989c..44a980db4 100644 --- a/ports/zstd/portfile.cmake +++ b/ports/zstd/portfile.cmake @@ -6,7 +6,7 @@ vcpkg_from_github( SHA512 d3c8c1dfabd251b03205b64eff97898c1e2ca457191b1f6257450e6d2675451a68aa0bc2220b2c65baa69a6997d98490612779d95b3325320c0a3202810ae554 HEAD_REF dev) -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") set(ZSTD_STATIC 1) set(ZSTD_SHARED 0) else() @@ -14,10 +14,12 @@ else() set(ZSTD_SHARED 1) endif() -# Enable multithreaded mode. CMake build doesn't provide a multithreaded -# library target, but it is the default in Makefile and VS projects. -set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS} /DZSTD_MULTITHREAD") -set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS}") +if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" OR NOT VCPKG_CMAKE_SYSTEM_NAME) + # Enable multithreaded mode. CMake build doesn't provide a multithreaded + # library target, but it is the default in Makefile and VS projects. + set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS} -DZSTD_MULTITHREAD") + set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS}") +endif() vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH}/build/cmake @@ -36,7 +38,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_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}") |