diff options
| author | zi-m <zi.m.github.com@gmail.com> | 2020-04-14 08:54:22 +0200 |
|---|---|---|
| committer | zi-m <zi.m.github.com@gmail.com> | 2020-04-14 08:54:22 +0200 |
| commit | 5c30e5b6bca6731bf43570967b46340c0160a328 (patch) | |
| tree | 268f8986ec8890b84f5c2c0a0a45ac3008cd66d1 | |
| parent | db7aaf8ab273377ab790a93afae5aeb6fbf5843d (diff) | |
| download | vcpkg-5c30e5b6bca6731bf43570967b46340c0160a328.tar.gz vcpkg-5c30e5b6bca6731bf43570967b46340c0160a328.zip | |
update portfile.cmake according to NancyLi1013 review
| -rw-r--r-- | ports/zstd/portfile.cmake | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ports/zstd/portfile.cmake b/ports/zstd/portfile.cmake index c41590201..0836ab0e6 100644 --- a/ports/zstd/portfile.cmake +++ b/ports/zstd/portfile.cmake @@ -17,7 +17,7 @@ else() set(ZSTD_SHARED 1) endif() -if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" OR NOT VCPKG_CMAKE_SYSTEM_NAME) +if(VCPKG_TARGET_IS_WINDOWS) # 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") @@ -43,7 +43,7 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/zstd) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) -if((VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" OR NOT VCPKG_CMAKE_SYSTEM_NAME) AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") +if(VCPKG_TARGET_IS_WINDOWS 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}") @@ -51,6 +51,6 @@ if((VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" OR NOT VCPKG_CMAKE_SYSTEM_NA endforeach() endif() -file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/zstd) -file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/zstd) -file(WRITE ${CURRENT_PACKAGES_DIR}/share/zstd/copyright "ZSTD is dual licensed - see LICENSE and COPYING files\n") +file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(WRITE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright "ZSTD is dual licensed - see LICENSE and COPYING files\n") |