diff options
| author | Long Nguyen <nguyen.long.908132@gmail.com> | 2020-07-16 05:09:33 +0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-15 15:09:33 -0700 |
| commit | 830893fb8eefbc12f5a7f8274bfc2ac79dd85449 (patch) | |
| tree | 28f506b63809383b5f62bae5a8caccd6a0cf457d /ports/liblzma | |
| parent | bad319d271fa31557aaede98cb0478ced1213952 (diff) | |
| download | vcpkg-830893fb8eefbc12f5a7f8274bfc2ac79dd85449.tar.gz vcpkg-830893fb8eefbc12f5a7f8274bfc2ac79dd85449.zip | |
[liblzma, libvpx] Add mingw support (#12401)
* [liblzma] Update to v5.2.5
* [liblzma] Use WIN32 instead of MSVC
* [libvpx] Add mingw support
* Update portfile.cmake
* Update CONTROL
* Update CONTROL
Co-authored-by: Lily <47812810+LilyWangL@users.noreply.github.com>
Diffstat (limited to 'ports/liblzma')
| -rw-r--r-- | ports/liblzma/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | ports/liblzma/CONTROL | 2 | ||||
| -rw-r--r-- | ports/liblzma/portfile.cmake | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/ports/liblzma/CMakeLists.txt b/ports/liblzma/CMakeLists.txt index 626655150..c87b0b611 100644 --- a/ports/liblzma/CMakeLists.txt +++ b/ports/liblzma/CMakeLists.txt @@ -130,8 +130,8 @@ add_library(LibLZMA src/liblzma/simple/x86.c ) -if(MSVC) - target_include_directories(LibLZMA PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/windows/vs2017>) +if(WIN32) + target_include_directories(LibLZMA PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/windows/vs2019>) else() target_compile_definitions(LibLZMA PRIVATE -DHAVE_VISIBILITY=1) endif() diff --git a/ports/liblzma/CONTROL b/ports/liblzma/CONTROL index 465efb054..e95b13c3c 100644 --- a/ports/liblzma/CONTROL +++ b/ports/liblzma/CONTROL @@ -1,4 +1,4 @@ Source: liblzma -Version: 5.2.4-5 +Version: 5.2.5 Homepage: https://github.com/xz-mirror/xz Description: Compression library with an API similar to that of zlib. diff --git a/ports/liblzma/portfile.cmake b/ports/liblzma/portfile.cmake index 8429dbbca..acc0dbaaa 100644 --- a/ports/liblzma/portfile.cmake +++ b/ports/liblzma/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO xz-mirror/xz - REF v5.2.4 - SHA512 fce7dc65e77a9b89dbdd6192cb37efc39e3f2cf343f79b54d2dfcd845025dab0e1d5b0f59c264eab04e5cbaf914eeb4818d14cdaac3ae0c1c5de24418656a4b7 + REF v5.2.5 + SHA512 686f01cfe33e2194766a856c48668c661b25eee194a443524f87ce3f866e0eb54914075b4e00185921516c5211db8cd5d2658f4b91f4a3580508656f776f468e HEAD_REF master PATCHES enable-uwp-builds.patch @@ -86,6 +86,6 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL static) ) endif() -file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/liblzma) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/liblzma RENAME copyright)
\ No newline at end of file +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) |